From 30864302715cc91772fdbf10b1318d1f671bfe43 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sun, 8 Oct 2023 10:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9+demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../technicalSpecificationList.js             |   1 +
 src/views/demo/demo.vue                       |  12 +-
 .../projectInfo/com_project_info_part.vue     |   2 +-
 .../com_project_technicalSpecification.vue    | 405 +++++++++++++++
 .../project/projectInfo/projectInfo.vue       | 210 +++++---
 .../modules/sampleManagement/demoZuJian.vue   | 481 ------------------
 .../com_tsd_basicInformation.vue              | 257 ++++++++++
 .../technicalSpecificationDetail.vue          |  56 ++
 .../tsdzujian.vue                             |  89 ++++
 .../technicalSpecificationList.vue            | 261 ++++------
 10 files changed, 1046 insertions(+), 728 deletions(-)
 create mode 100644 src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
 delete mode 100644 src/views/modules/sampleManagement/demoZuJian.vue
 create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
 create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
 create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue

diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 27845e1..e88b2f4 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -3,3 +3,4 @@ import { createAPI } from "@/utils/httpRequest.js";
 export const technicalSpecificationListSearch = data => createAPI(`/technicalSpecification/technicalSpecificationListSearch`,'post',data)
 export const saveTechnicalSpecificationSheet = data => createAPI(`/technicalSpecification/saveTechnicalSpecificationSheet`,'post',data)
 export const searchTechnicalSpecificationTeamStr = data => createAPI(`/technicalSpecification/searchTechnicalSpecificationTeamStr`,'post',data)
+export const getTechnicalCustomerInfoData = data => createAPI(`/technicalSpecification/getTechnicalCustomerInfoData`,'post',data)
diff --git a/src/views/demo/demo.vue b/src/views/demo/demo.vue
index 0d99023..ced8645 100644
--- a/src/views/demo/demo.vue
+++ b/src/views/demo/demo.vue
@@ -132,6 +132,7 @@
           username: this.$store.state.user.name,
           projectId: '',
         },
+        exportList:[],
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
@@ -534,10 +535,15 @@
         })
       },
       //导出excel
-      createExportData() {
-
-        return this.dataList;
+      //导出excel
+      async createExportData() {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await projectInfoSearch(this.searchData).then(({data}) => {
+          this.exportList= data.page.list;
+        })
 
+        return this.exportList;
       },
       startDownload() {
         //  this.exportData = this.dataList
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 930d520..432382d 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -65,7 +65,7 @@
         </el-form-item>
 
         <el-form-item prop="partTypeDesc" :rules="dataRole.partTypeDesc">
-          <span slot="label" style="" @click="getBaseList(1013,1)"><a herf="#">物料类型</a></span>
+          <span slot="label" style="" @click="getBaseList(1013,1)"><a herf="#">物料类别</a></span>
           <el-input v-model="dataForm.partTypeDesc" style="width: 130px" readonly  @focus="getBaseList(1013,1)" ></el-input>
         </el-form-item>
         <el-form-item label=" ">
diff --git a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
new file mode 100644
index 0000000..30beded
--- /dev/null
+++ b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+<!--        <el-button type="primary" @click="addModal()">新增</el-button>-->
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ '导出' }}
+        </download-excel>
+      </el-form>
+    </el-form>
+    <el-table
+      :data="dataList"
+      height="240"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%; ">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150"-->
+<!--        fixed="right"-->
+<!--        label="操作">-->
+<!--        <template slot-scope="scope">-->
+<!--          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>-->
+<!--          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    technicalSpecificationListSearch, // 测试信息列表查询
+
+  } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        dataList: [],
+        searchData: {
+          site: '',
+          username: this.$store.state.user.name,
+          projectId: '',
+          page: 1,
+          limit: 1000
+        },
+        visible:false,
+        dataListLoading: false,
+        currentRow:'',
+        columnList:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9CodeNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "codeNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "参数卡编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9Status',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "statusDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 50
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9FinalPartNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "finalPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "最终产品编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9TestPartNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "testPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "项目料号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9PartName',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9RevNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "revNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "版本号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 50
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9ECNFlag',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "ecnFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "ECN变更",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 50
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9EcnNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "ecnNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "ECN单据号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9ProofingNo',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "proofingNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "打样申请单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9CreateDate',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "createDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "创建时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9CreateBy',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "createBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "创建人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9UpdateDate',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "updateDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "上次修改日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9UpdateBy',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "updateBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "修改人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table9ecnAddress',
+            tableId: "101002001Table9",
+            tableName: "技术参数卡列表",
+            columnProp: "ecnAddress",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "ECN文档链接",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200
+          },
+        ],
+        // 导出 start
+        exportData: [],
+        exportName: '技术参数卡'+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["技术参数卡"],
+        exportFooter: [],
+        // 导出 end
+      }
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+          // if (val === 1013) {
+          //   if(type==1) {
+          //     strVal = this.dataForm.partType
+          //   }
+          // }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        // if (this.tagNo === 1013) {
+        //   if(this.tagNo1==1) {
+        //     this.dataForm.partType = val.Base_id
+        //     this.dataForm.partTypeDesc = val.Base_desc
+        //   }
+        // }
+      },
+      //初始化组件的参数
+      init(inData) {
+        //初始化参数
+        this.searchData = JSON.parse(JSON.stringify(inData));
+        //刷新表格
+       this.searchTable();
+
+      },
+      searchTable(){
+        technicalSpecificationListSearch(this.searchData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList = data.page.list
+          } else {
+            this.dataList = [];
+          }
+        });
+      },
+      createExportData() {
+
+        return this.dataList;
+
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 6ed37a5..2b6e97e 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -79,81 +79,130 @@
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
       <el-tab-pane label="项目信息" name="info">
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'项目号'">
-            <el-input v-model="projectData.projectId" readonly style="width: 200px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目类型'">
-            <el-input v-model="projectData.projectType" readonly style="width: 174px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目来源'">
-            <el-input v-model="projectData.projectSourceDesc" readonly style="width: 200px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'优先级'">
-            <el-input v-model="projectData.priorityDesc" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'需求日期'">
-            <el-input v-model="projectData.needDate" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'项目名称'">
-            <el-input v-model="projectData.projectName" readonly style="width: 350px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目描述'">
-            <el-input v-model="projectData.projectDesc" readonly style="width: 564px" ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'项目经理'">
-            <el-input v-model="projectData.projectManagerName" readonly style="width: 300px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目责任人'">
-            <el-input v-model="projectData.projectOwnerName" readonly style="width: 300px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目权限'">
-            <el-input v-model="projectData.userRoleName" readonly style="width: 300px" ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'客户应用/要求'">
-            <el-input v-model="projectData.customerRemark" readonly style="width: 926px" ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'其他特殊要求'">
-            <el-input v-model="projectData.remark" readonly style="width: 926px" ></el-input>
-          </el-form-item>
+        <el-form label-position="top" style="margin-top: 0px; margin-left: 0px;">
+          <el-row :gutter="20">
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目号'">
+                <el-input v-model="projectData.projectId" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目类型'">
+                <el-input v-model="projectData.projectType" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目来源'">
+                <el-input v-model="projectData.projectSourceDesc" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'优先级'">
+                <el-input v-model="projectData.priorityDesc" readonly></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'需求日期'">
+                <el-input v-model="projectData.needDate" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目名称'">
+                <el-input v-model="projectData.projectName" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="18"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目描述'">
+                <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="8"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目经理'">
+                <el-input v-model="projectData.projectManagerName" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="8"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目责任人'">
+                <el-input v-model="projectData.projectOwnerName" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="8"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目权限'">
+                <el-input v-model="projectData.userRoleName" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="24"><div class="grid-content bg-purple">
+              <el-form-item :label="'客户应用/要求'">
+                <el-input v-model="projectData.customerRemark" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="24"><div class="grid-content bg-purple">
+              <el-form-item :label="'其他特殊要求'">
+                <el-input v-model="projectData.remark" readonly style="" ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
         </el-form>
+
       </el-tab-pane>
       <el-tab-pane label="客户信息" name="customer">
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'客户代码'">
-            <el-input v-model="customerData.customerNo" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'客户名称'">
-            <el-input v-model="customerData.customerDesc" readonly style="width: 254px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'客户币种'">
-            <el-input v-model="customerData.customerCurrency" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'年营业额'">
-            <el-input v-model="customerData.turnoverOfYear" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'年度潜在收入'">
-            <el-input v-model="customerData.potentialRevenueOfYear" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'关键客户'">
-            <el-input v-model="customerData.importantCustomer" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'客户状态'">
-            <el-input v-model="customerData.customerStatus" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'备注信息'">
-            <el-input v-model="customerData.remark" readonly style="width: 580px" ></el-input>
-          </el-form-item>
+        <el-form  label-position="top" label-width="100px" >
+          <el-row :gutter="20">
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'客户代码'">
+                <el-input v-model="customerData.customerNo" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="8"><div class="grid-content bg-purple">
+              <el-form-item :label="'客户名称'">
+                <el-input v-model="customerData.customerDesc" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'客户币种'">
+                <el-input v-model="customerData.customerCurrency" readonly ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'年营业额'">
+                <el-input v-model="customerData.turnoverOfYear" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'年度潜在收入'">
+                <el-input v-model="customerData.potentialRevenueOfYear" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'关键客户'">
+                <el-input v-model="customerData.importantCustomer" readonly ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'客户状态'">
+                <el-input v-model="customerData.customerStatus" readonly ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="16"><div class="grid-content bg-purple">
+              <el-form-item :label="'备注信息'">
+                <el-input v-model="customerData.remark" readonly ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="客户联系人" name="customer_contact">
@@ -258,6 +307,9 @@
       <el-tab-pane label="刀模申请" name="purchase">
         <purchase ref="purchase"  ></purchase>
       </el-tab-pane>
+      <el-tab-pane label="技术参数卡" name="technicalSpecification">
+        <technicalSpecification ref="technicalSpecification"  ></technicalSpecification>
+      </el-tab-pane>
     </el-tabs>
     <el-dialog
       width="530px"
@@ -307,6 +359,7 @@
   import sample from "./com_project_sample";/*組件*/
   import test from "./com_project_test";/*組件*/
   import purchase from "./com_project_info_purchase_request";/*組件*/
+  import technicalSpecification from "./com_project_technicalSpecification";/*組件*/
   export default {
     components: {
       Chooselist,
@@ -317,6 +370,7 @@
       sample,
       test,
       purchase,
+      technicalSpecification,
     },
     name: "null",
     data() {
@@ -1106,6 +1160,9 @@
         if (this.activeName == 'purchase') {
           this.refreshPurchaseTable();
         }
+        if (this.activeName == 'technicalSpecification') {
+          this.refreshTechnicalSpecificationTable();
+        }
       },
       refreshPartTable(){
         let inData={
@@ -1115,6 +1172,15 @@
         }
         this.$refs.projectPart.init(inData)
       },
+      refreshTechnicalSpecificationTable(){
+        let inData={
+          site: this.currentRow.site,
+          projectId: this.currentRow.projectId,
+          page: 1,
+          limit: 1000
+        }
+        this.$refs.technicalSpecification.init(inData)
+      },
       refreshQuotationTable(){
         let inData={
           site: this.currentRow.site,
diff --git a/src/views/modules/sampleManagement/demoZuJian.vue b/src/views/modules/sampleManagement/demoZuJian.vue
deleted file mode 100644
index de00546..0000000
--- a/src/views/modules/sampleManagement/demoZuJian.vue
+++ /dev/null
@@ -1,481 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-form :inline="true" label-position="top" style="margin-top: 0px">
-        <el-button type="primary" @click="addModal()">新增</el-button>
-      </el-form>
-    </el-form>
-    <el-table
-      :data="dataList"
-      height="240"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%; ">
-      <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :sortable="item.columnSortable"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
-        :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
-        :min-width="item.columnWidth"
-        :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        header-align="center"
-        align="center"
-        width="150"
-        fixed="right"
-        label="操作">
-        <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>
-          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog
-      width="600px"
-      :title="!dataForm.id ?  '添加' :'编辑'"
-      :close-on-click-modal="false"
-      :visible.sync="visible">
-      <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
-        <el-form-item :label="'项目料号'">
-          <el-input v-model="dataForm.testPartNo" style="width: 130px" disabled></el-input>
-        </el-form-item>
-
-        <el-form-item prop="partTypeDesc" :rules="dataRole.partTypeDesc">
-          <span slot="label" style="" @click="getBaseList(1013,1)"><a herf="#">物料类型</a></span>
-          <el-input v-model="dataForm.partTypeDesc" style="width: 130px" readonly  @focus="getBaseList(1013,1)" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px"  :rules="dataRole">
-        <el-form-item :label="'物料名称'" prop="partName" :rules="dataRole.partName">
-          <el-input v-model="dataForm.partName" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料描述'">
-          <el-input v-model="dataForm.partDesc" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料描述'">
-          <el-input v-model="dataForm.partSpec" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料图号'">
-          <el-input v-model="dataForm.materialNumber" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'备注'">
-          <el-input v-model="dataForm.remark" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData()">{{'确定'}}</el-button>
-        <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
-      </span>
-    </el-dialog>
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
-  </div>
-</template>
-
-<script>
-  import {
-    getProjectInfoPartList,
-    saveProjectPart,
-    deleteProjectPartWithId,
-  } from "@/api/project/project.js"
-  import Chooselist from '@/views/modules/common/Chooselist'
-  export default {
-    components: {
-      Chooselist
-    },
-    data() {
-      return {
-        dataList: [],
-        searchData: {
-          site: '',
-          username: this.$store.state.user.name,
-          projectId: '',
-        },
-        visible:false,
-        dataListLoading: false,
-        currentRow:'',
-        columnList:[
-          {
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4TestPartNo',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "testPartNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料编码",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4PartType',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "partType",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料分类",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 60
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4PartTypeDesc',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "partTypeDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料分类名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4PartName',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "partName",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4PartDesc',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料描述",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4PartSpec',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "partSpec",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "规格型号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4MaterialNumber',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "materialNumber",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料图号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4Remark',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "remark",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "备注",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4CreateDate',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "createDate",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "创建时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 160
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4CreateBy',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "createBy",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "创建人",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4UpdateDate',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "updateDate",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "上次修改日期",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 160
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002003,
-          serialNumber: '101002003Table4UpdateBy',
-          tableId: "101002003Table4",
-          tableName: "项目物料",
-          columnProp: "updateBy",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "修改人",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },
-        ],
-        dataForm:{
-          id:'',
-          site: '',
-          projectId: '',
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:'',
-        },
-        dataRole: {
-          partTypeDesc: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          partName: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-        }
-      }
-    },
-    methods: {
-      // 获取基础数据列表S
-      getBaseList (val, type) {
-        this.tagNo = val
-        this.tagNo1 = type
-        this.$nextTick(() => {
-          let strVal = ''
-          if (val === 1013) {
-            if(type==1) {
-              strVal = this.dataForm.partType
-            }
-          }
-          this.$refs.baseList.init(val, strVal)
-        })
-      },
-      /* 列表方法的回调 */
-      getBaseData (val) {
-        if (this.tagNo === 1013) {
-          if(this.tagNo1==1) {
-            this.dataForm.partType = val.Base_id
-            this.dataForm.partTypeDesc = val.Base_desc
-          }
-        }
-      },
-      //初始化组件的参数
-      init(inData) {
-        //初始化参数
-        this.searchData = JSON.parse(JSON.stringify(inData));
-        //刷新表格
-        this.searchTable();
-
-      },
-      searchTable(){
-        getProjectInfoPartList(this.searchData).then(({data}) => {
-          //区分请求成功和失败的状况
-          if (data && data.code == 0) {
-            this.dataList = data.rows;
-          } else {
-            this.dataList = [];
-          }
-        });
-      },
-      addModal(){
-        if(this.searchData.projectId==""||this.searchData.projectId==null){
-          this.$alert('请选择项目！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        this.dataForm={
-          id:0,
-          site: this.searchData.site,
-          projectId: this.searchData.projectId,
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:this.$store.state.user.name,
-        }
-        this.visible=true;
-      },
-      updateModel(row){
-        this.dataForm={
-          id:row.id,
-          site: row.site,
-          projectId: row.projectId,
-          testPartNo:row.testPartNo,
-          partType:row.partType,
-          partTypeDesc:row.partTypeDesc,
-          partName:row.partName,
-          partDesc:row.partDesc,
-          partSpec:row.partSpec,
-          remark:row.remark,
-          materialNumber:row.materialNumber,
-          username:this.$store.state.user.name,
-        }
-        this.visible=true;
-      },
-      saveData(){
-        if(this.dataForm.partType==''||this.dataForm.partType==null){
-          this.$alert('请选择物料类别！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        if(this.dataForm.partName==''||this.dataForm.partName==null){
-          this.$alert('请输入物料名称！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        saveProjectPart(this.dataForm).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message.success( '操作成功')
-            this.visible = false
-            this.searchTable();
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      deleteData(){
-        this.$confirm('确定要删除这条数据?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteProjectPartWithId(this.dataForm).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success( '操作成功')
-              this.searchTable();
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {
-        })
-      },
-
-    },
-  }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
new file mode 100644
index 0000000..a721576
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -0,0 +1,257 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'参数卡编码'">
+            <el-input v-model="dataForm.codeNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'版本号'">
+            <el-input v-model="dataForm.revNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'加工中心编码'">
+            <el-input v-model="dataForm.workCenterNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'加工中心名称'">
+            <el-input v-model="dataForm.workCenterDesc" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'打样单号'">
+            <el-input v-model="dataForm.proofingNo" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="18"><div class="grid-content bg-purple">
+          <el-form-item :label="'打样描述'">
+            <el-input v-model="dataForm.proofingDesc" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'项目号'">
+            <el-input v-model="dataForm.projectId" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="18"><div class="grid-content bg-purple">
+          <el-form-item :label="'项目描述'">
+            <el-input v-model="dataForm.revNo" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'物料编码'">
+            <el-input v-model="dataForm.finalPartNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'项目料号'">
+            <el-input v-model="dataForm.testPartNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'客户料号'">
+            <el-input v-model="dataForm.customerPartNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'物料描述'">
+            <el-input v-model="dataForm.partDesc" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'规格型号'">
+            <el-input v-model="dataForm.spec" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'物料图号'">
+            <el-input v-model="dataForm.materialNumber" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'物料类别'">
+            <el-input v-model="dataForm.partType" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'类别名称'">
+            <el-input v-model="dataForm.partTypeDesc" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'ECN变更'">
+            <el-input v-model="dataForm.ecnFlag" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'ECN单据号'">
+            <el-input v-model="dataForm.ecnNo" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="12"><div class="grid-content bg-purple">
+          <el-form-item :label="'ECN文档路径'">
+            <el-input v-model="dataForm.ecnAddress" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'报价员'">
+            <el-input v-model="dataForm.quotationOfficer" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'工程师'">
+            <el-input v-model="dataForm.engineer" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'技术员'">
+            <el-input v-model="dataForm.technician" readonly  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'备注信息'" style="height: 80px">
+            <el-input
+              type="textarea"
+              v-model="dataForm.remark "
+              :rows="3"
+              resize='none'
+              maxlength="120"
+              show-word-limit
+              readonly
+              style="height: 60px">
+            </el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+    </el-form>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getProjectInfoPartList,
+    saveProjectPart,
+    deleteProjectPartWithId,
+  } from "@/api/project/project.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        searchData: {
+          site: '',
+          username: this.$store.state.user.name,
+          projectId: '',
+        },
+        dataForm:{
+          codeNo:'',
+          revNo:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          proofingNo:'',
+          proofingDesc:'',
+          finalPartNo:'',
+          testPartNo:'',
+          customerPartNo:'',
+          partDesc:'',
+          ecnFlag:'',
+          ecnNo:'',
+          ecnAddress:'',
+          quotationOfficer:'',
+          engineer:'',
+          technician:'',
+          remark:'',
+
+        },
+        dataRole: {
+          partTypeDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1013) {
+            if(type==1) {
+              strVal = this.dataForm.partType
+            }
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1013) {
+          if(this.tagNo1==1) {
+            this.dataForm.partType = val.Base_id
+            this.dataForm.partTypeDesc = val.Base_desc
+          }
+        }
+      },
+      //初始化组件的参数
+      init(inData) {
+        //初始化参数
+        this.searchData = JSON.parse(JSON.stringify(inData));
+        //刷新表格
+        this.searchTable();
+
+      },
+
+
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
new file mode 100644
index 0000000..d908219
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -0,0 +1,56 @@
+<template>
+    <div class="mod-config">
+      <el-tabs class="tabs" tab-position="left" style="height: 200px;"  type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
+        <el-tab-pane label="基本信息"  name="baseInfo" >
+          <basicInformation ref="basicInformation"  ></basicInformation>
+        </el-tab-pane>
+        <el-tab-pane label="客户信息"  name="customerInfo">
+          777
+        </el-tab-pane>
+        <el-tab-pane label="工艺信息"  name="customerInfo" v-if="false">
+          777
+        </el-tab-pane>
+        <el-tab-pane label="文档控制"  name="customerInfo2" v-if="true">
+          777
+        </el-tab-pane>
+        <el-tab-pane label="工程师确认"  name="customerInfo3">
+          777
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+</template>
+
+<script>
+  import basicInformation from "./com_tsd_basicInformation";/*組件*/
+  export default {
+    name: "technicalSpecificationDetail",
+    components: {
+      basicInformation,
+
+    },
+    data() {
+      return {
+        dataForm:{
+
+        },
+        activeName:'baseInfo',
+
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        var tabsElement = document.querySelector('.tabs');
+        tabsElement.style.minHeight = window.innerHeight-100+'px';
+      })
+    },
+    methods: {
+      refreshCurrentTabTable(){
+
+      },
+    },
+  }
+</script>
+
+<style >
+
+</style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue
new file mode 100644
index 0000000..2d24a3b
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-button type="primary" @click="addModal()">新增</el-button>
+      </el-form>
+    </el-form>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getProjectInfoPartList,
+    saveProjectPart,
+    deleteProjectPartWithId,
+  } from "@/api/project/project.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        searchData: {
+          site: '',
+          username: this.$store.state.user.name,
+          projectId: '',
+        },
+        dataRole: {
+          partTypeDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1013) {
+            if(type==1) {
+              strVal = this.dataForm.partType
+            }
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1013) {
+          if(this.tagNo1==1) {
+            this.dataForm.partType = val.Base_id
+            this.dataForm.partTypeDesc = val.Base_desc
+          }
+        }
+      },
+      //初始化组件的参数
+      init(inData) {
+        //初始化参数
+        this.searchData = JSON.parse(JSON.stringify(inData));
+        //刷新表格
+        this.searchTable();
+
+      },
+
+
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue
index f10fb2a..eb6fc12 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue
@@ -77,22 +77,34 @@
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="refreshCurrentTabTable">
       <el-tab-pane label="基本信息" name="info">
-        <el-form :inline="true" label-position="top" label-width="100px" >
-          <el-form-item :label="'物料编码'">
-            <el-input v-model="infoData.testPartNo" readonly style="width: 200px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'物料类型'">
-            <el-input v-model="infoData.partTypeDesc" readonly style="width: 174px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'版本号'">
-            <el-input v-model="infoData.revNo" readonly style="width: 200px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'打样单号'">
-            <el-input v-model="infoData.proofingNo" readonly style="width: 150px" ></el-input>
-          </el-form-item>
-          <el-form-item :label="'项目号'">
-            <el-input v-model="infoData.projectId" readonly style="width: 150px" ></el-input>
-          </el-form-item>
+        <el-form  label-position="top" label-width="100px" >
+          <el-row :gutter="20">
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'物料编码'">
+                <el-input v-model="infoData.testPartNo" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'物料类型'">
+                <el-input v-model="infoData.partTypeDesc" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple">
+              <el-form-item :label="'版本号'">
+                <el-input v-model="infoData.revNo" readonly ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'打样单号'">
+                <el-input v-model="infoData.proofingNo" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+            <el-col :span="5"><div class="grid-content bg-purple">
+              <el-form-item :label="'项目号'">
+                <el-input v-model="infoData.projectId" readonly  ></el-input>
+              </el-form-item>
+            </div></el-col>
+          </el-row>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" >
           <el-form-item :label="'ECN变更'">
@@ -134,34 +146,34 @@
       <el-tab-pane label="客户信息" name="customerInfo">
         <el-form :inline="true" label-position="top" label-width="100px" >
           <el-form-item :label="'客户代码'">
-            <el-input v-model="infoData.testPartNo" readonly style="width: 150px" ></el-input>
+            <el-input v-model="customerData.customerId" readonly style="width: 150px" ></el-input>
           </el-form-item>
-          <el-form-item :label="'客户简称'">
-            <el-input v-model="infoData.partTypeDesc" readonly style="width: 150px" ></el-input>
+          <el-form-item :label="'客户名称'">
+            <el-input v-model="customerData.customerDesc" readonly style="width: 150px" ></el-input>
           </el-form-item>
           <el-form-item :label="'客户描述'">
-            <el-input v-model="infoData.revNo" readonly style="width: 600px" ></el-input>
+            <el-input v-model="customerData.customerDescription" readonly style="width: 600px" ></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" >
           <el-form-item :label="'终端客户'">
-            <el-input v-model="infoData.proofingNo" readonly style="width: 150px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 150px" ></el-input>
           </el-form-item>
           <el-form-item :label="'直接客户'">
-            <el-input v-model="infoData.projectId" readonly style="width: 150px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 150px" ></el-input>
           </el-form-item>
           <el-form-item :label="'客户版本'">
-            <el-input v-model="infoData.projectId" readonly style="width: 150px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 150px" ></el-input>
           </el-form-item>
           <el-form-item :label="'需要的认证'">
-            <el-input v-model="infoData.projectId" readonly style="width: 150px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 150px" ></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" style="height: 70px">
           <el-form-item :label="'客户要求'">
             <el-input
               type="textarea"
-              v-model="infoData.remark "
+              v-model="customerData.customerRemark "
               :rows="3"
               resize='none'
               maxlength="120"
@@ -173,19 +185,19 @@
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 15px">
           <el-form-item :label="'客户图纸'">
-            <el-input v-model="infoData.quotationOfficer" readonly style="width: 926px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 926px" ></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" >
           <el-form-item :label="'客户图纸变更说明'">
-            <el-input v-model="infoData.quotationOfficer" readonly style="width: 926px" ></el-input>
+            <el-input v-model="customerData.finalCustomer" readonly style="width: 926px" ></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" style="height: 70px">
           <el-form-item :label="'转量产附档说明'">
             <el-input
               type="textarea"
-              v-model="infoData.remark "
+              v-model="customerData.finalCustomer "
               :rows="3"
               resize='none'
               maxlength="120"
@@ -199,21 +211,7 @@
           <el-form-item :label="'其他特殊要求'">
             <el-input
               type="textarea"
-              v-model="infoData.remark "
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              readonly
-              style="width: 926px;height: 60px">
-            </el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="height: 70px;margin-top: 15px">
-          <el-form-item :label="'备注信息'">
-            <el-input
-              type="textarea"
-              v-model="infoData.remark "
+              v-model="customerData.remark "
               :rows="3"
               resize='none'
               maxlength="120"
@@ -223,53 +221,22 @@
             </el-input>
           </el-form-item>
         </el-form>
+<!--        <el-form :inline="true" label-position="top" label-width="100px" style="height: 70px;margin-top: 15px">-->
+<!--          <el-form-item :label="'客户应用/要求'">-->
+<!--            <el-input-->
+<!--              type="textarea"-->
+<!--              v-model="customerData.remark "-->
+<!--              :rows="3"-->
+<!--              resize='none'-->
+<!--              maxlength="120"-->
+<!--              show-word-limit-->
+<!--              readonly-->
+<!--              style="width: 926px;height: 60px">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
       </el-tab-pane>
     </el-tabs>
-    <el-dialog
-      width="600px"
-      :title="!dataForm.id ?  '添加' :'编辑'"
-      :close-on-click-modal="false"
-      :visible.sync="visible">
-      <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
-        <el-form-item :label="'项目料号'">
-          <el-input v-model="dataForm.testPartNo" style="width: 130px" disabled></el-input>
-        </el-form-item>
-
-        <el-form-item prop="partTypeDesc" :rules="dataRole.partTypeDesc">
-          <span slot="label" style="" @click="getBaseList(1013,1)"><a herf="#">物料类型</a></span>
-          <el-input v-model="dataForm.partTypeDesc" style="width: 130px" readonly  @focus="getBaseList(1013,1)" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px"  :rules="dataRole">
-        <el-form-item :label="'物料名称'" prop="partName" :rules="dataRole.partName">
-          <el-input v-model="dataForm.partName" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料描述'">
-          <el-input v-model="dataForm.partDesc" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料描述'">
-          <el-input v-model="dataForm.partSpec" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'物料图号'">
-          <el-input v-model="dataForm.materialNumber" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="'备注'">
-          <el-input v-model="dataForm.remark" style="width: 562px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData()">{{'确定'}}</el-button>
-        <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
-      </span>
-    </el-dialog>
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="search" v-drag></add-or-update>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -277,8 +244,8 @@
 
 <script>
   import {
+    getTechnicalCustomerInfoData,
     technicalSpecificationListSearch,
-
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   import AddOrUpdate from './com_technical-add-or-update'
@@ -304,9 +271,9 @@
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
-        visible:false,
         dataListLoading: false,
         currentRow:'',
+        exportList:[],
         columnList1:[
           {
             userId: this.$store.state.user.name,
@@ -548,20 +515,6 @@
             columnWidth: 200
           },
         ],
-        dataForm:{
-          id:'',
-          site: '',
-          projectId: '',
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:'',
-        },
         infoData:{
           testPartNo:'',
           partTypeDesc:'',
@@ -576,6 +529,14 @@
           technician:'',
           remark:'',
         },
+        customerData:{
+          customerId:'',
+          customerDesc:'',
+          customerDescription:'',
+          finalCustomer:'',
+          customerRemark:'',
+          remark:'',
+        },
         dataRole: {
           partTypeDesc: [
             {
@@ -659,7 +620,22 @@
         })
       },
       refreshCurrentTabTable () {
-
+        if (this.activeName == 'customerInfo') {
+          this.getTechnicalCustomerInfoData();
+        }
+      },
+      getTechnicalCustomerInfoData(){
+        let inData={
+          id:this.currentRow.id
+        }
+        getTechnicalCustomerInfoData(inData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.customerData = data.row;
+          } else {
+            this.customerData = [];
+          }
+        });
       },
       /* 列表方法的回调 */
       getBaseData (val) {
@@ -682,69 +658,8 @@
           this.$refs.addOrUpdate.init(id)
         })
       },
-      addModal(){
-        if(this.searchData.projectId==""||this.searchData.projectId==null){
-          this.$alert('请选择项目！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        this.dataForm={
-          id:0,
-          site: this.searchData.site,
-          projectId: this.searchData.projectId,
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:this.$store.state.user.name,
-        }
-        this.visible=true;
-      },
-      updateModel(row){
-        this.dataForm={
-          id:row.id,
-          site: row.site,
-          projectId: row.projectId,
-          testPartNo:row.testPartNo,
-          partType:row.partType,
-          partTypeDesc:row.partTypeDesc,
-          partName:row.partName,
-          partDesc:row.partDesc,
-          partSpec:row.partSpec,
-          remark:row.remark,
-          materialNumber:row.materialNumber,
-          username:this.$store.state.user.name,
-        }
-        this.visible=true;
-      },
-      saveData(){
-        if(this.dataForm.partType==''||this.dataForm.partType==null){
-          this.$alert('请选择物料类别！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        if(this.dataForm.partName==''||this.dataForm.partName==null){
-          this.$alert('请输入物料名称！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        saveProjectPart(this.dataForm).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message.success( '操作成功')
-            this.visible = false
-            this.searchTable();
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
+
+
       deleteData(){
         this.$confirm('确定要删除这条数据?', '提示', {
           confirmButtonText: '确定',
@@ -763,10 +678,14 @@
         })
       },
       //导出excel
-      createExportData() {
-
-        return this.dataList;
+      async createExportData() {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await technicalSpecificationListSearch(this.searchData).then(({data}) => {
+          this.exportList= data.page.list;
+        })
 
+        return this.exportList;
       },
       startDownload() {
         //  this.exportData = this.dataList