From 60d3a4323aea850a1ef6ae5897c98b409a92f01a Mon Sep 17 00:00:00 2001
From: yfy <1976974459@qq.com>
Date: Thu, 20 Apr 2023 18:01:19 +0800
Subject: [PATCH] 4

---
 src/api/qc/qc.js                              |  11 +-
 ...cFamilyModel.vue => qcFamilyAttribute.vue} |   0
 .../{qcPartModel.vue => qcPartAttribute.vue}  | 618 ++++++++++--------
 src/views/modules/qc/qcTemplate.vue           | 279 ++++----
 4 files changed, 529 insertions(+), 379 deletions(-)
 rename src/views/modules/qc/{qcFamilyModel.vue => qcFamilyAttribute.vue} (100%)
 rename src/views/modules/qc/{qcPartModel.vue => qcPartAttribute.vue} (65%)

diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index c6166b4..5972b48 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -64,6 +64,7 @@ export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data
 export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data)
 export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data)
 export const InspectionTypeSearch = data => createAPI(`/pms/qc/InspectionTypeSearch`,'post',data)
+export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data)
 export const ItemDetailsSearch = data => createAPI(`/pms/qc/ItemDetailsSearch`,'post',data)
 export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data)
 export const getItemList = data => createAPI(`/pms/qc/getItemList`,'post',data)
@@ -95,8 +96,14 @@ export const samplingInspectionPlanSave = data => createAPI(`/pms/qc/samplingIns
 export const samplingInspectionPlanUpdate = data => createAPI(`/pms/qc/samplingInspectionPlanUpdate`,'post',data)
 export const samplingInspectionPlanDelete = data => createAPI(`/pms/qc/samplingInspectionPlanDelete`,'post',data)
 
-
-
+// ===================================== 物料属性设置 =====================================
+export const qcPartAttributeSearch = data => createAPI(`/pms/qc/qcPartAttributeSearch`,'post',data)
+export const qcPartAttributeSave = data => createAPI(`/pms/qc/qcPartAttributeSave`,'post',data)
+export const qcPartAttributeDelete = data => createAPI(`/pms/qc/qcPartAttributeDelete`,'post',data)
+export const searchPartAttributeDetails = data => createAPI(`/pms/qc/searchPartAttributeDetails`,'post',data)
+export const savePartAttributeDetails = data => createAPI(`/pms/qc/savePartAttributeDetails`,'post',data)
+export const deletePartAttributeDetails = data => createAPI(`/pms/qc/deletePartAttributeDetails`,'post',data)
+export const saveAttributeDetailed = data => createAPI(`/pms/qc/saveAttributeDetailed`,'post',data)
 
 
 
diff --git a/src/views/modules/qc/qcFamilyModel.vue b/src/views/modules/qc/qcFamilyAttribute.vue
similarity index 100%
rename from src/views/modules/qc/qcFamilyModel.vue
rename to src/views/modules/qc/qcFamilyAttribute.vue
diff --git a/src/views/modules/qc/qcPartModel.vue b/src/views/modules/qc/qcPartAttribute.vue
similarity index 65%
rename from src/views/modules/qc/qcPartModel.vue
rename to src/views/modules/qc/qcPartAttribute.vue
index b58fed6..a389030 100644
--- a/src/views/modules/qc/qcPartModel.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -8,27 +8,14 @@
     </div>
     <!-- 条件查询 -->
     <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'检验模板编码'">
-        <el-input v-model="searchData.codeNo"  style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'检验模板名称'">
-        <el-input v-model="searchData.codeDesc"  style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc"  style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'检验类型名称'">
-        <el-input v-model="searchData.inspectionTypeName"  style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'是否在用'">
-        <el-select filterable v-model="searchData.active" style="width: 130px">
-          <el-option label="请选择" value=""></el-option>
-          <el-option label="是" value="Y"></el-option>
-          <el-option label="否" value="N"></el-option>
-        </el-select>
+      <el-form-item :label="'物料类别'">
+        <el-input v-model="searchData.familyName"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item  :label="' '">
         <el-button @click="doEmpty()">清空</el-button>
@@ -81,7 +68,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
-          <a type="text" size="small" @click="detailModal(scope.row)">检验项目</a>
+          <a type="text" size="small" @click="detailModal(scope.row)">检验模板</a>
           <a type="text" size="small" @click="deletePropertiesModel(scope.row)">删除</a>
         </template>
       </el-table-column>
@@ -99,18 +86,7 @@
     </el-pagination>
 
     <!-- 检验模板新增/修改 -->
-    <el-dialog title="检验模板"  :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验模板名称:">
-          <el-input v-model="modalData.codeDesc"  style="width: 120px"></el-input>
-        </el-form-item>
-        <el-form-item label="是否在用:">
-          <el-select filterable v-model="modalData.active" style="width: 120px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
+    <el-dialog title="物料属性设置"  :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
 
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
@@ -124,11 +100,17 @@
 
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1045)"><a herf="#">检验类型编码</a></span>
-          <el-input v-model="modalData.inspectionTypeNo" style="width: 120px"></el-input>
+          <span slot="label" style="" @click="getBaseList(1043)"><a herf="#">供应商编码</a></span>
+          <el-input v-model="modalData.supplierNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商名称:">
+          <el-input v-model="modalData.supplierDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="检验类型名称:">
-          <el-input v-model="modalData.inspectionTypeName" disabled style="width: 120px"></el-input>
+      </el-form>
+
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="备注:">
+          <el-input v-model="modalData.attributeRemark" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
 
@@ -138,14 +120,14 @@
       </el-footer>
     </el-dialog>
 
-    <!-- 检验项目 -->
-    <el-dialog title="检验项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
+    <!-- 检验模板 -->
+    <el-dialog title="检验模板清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1500px">
       <el-form :inline="true"  label-position="top"  @keyup.enter.native="getDataList()">
-        <el-form-item :label="'检验模板编码'">
-          <el-input v-model="detailData.codeNo"  readonly style="width: 120px"></el-input>
+        <el-form-item :label="'物料编码'">
+          <el-input v-model="detailData.partNo"  readonly style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item :label="'检验模板名称'">
-          <el-input v-model="detailData.codeDesc"  readonly style="width: 120px"></el-input>
+        <el-form-item :label="'物料名称'">
+          <el-input v-model="detailData.partDesc"  readonly style="width: 220px"></el-input>
         </el-form-item>
         <el-form-item  :label="' '">
           <el-button  type="primary" @click="addDetailModal()">新增</el-button>
@@ -153,6 +135,7 @@
         </el-form-item>
       </el-form>
       <!-- 检验项目展示列表 -->
+      <div class="rq ">
       <el-table
         :height="300"
         :data="detailList"
@@ -175,36 +158,102 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="检验水平">
+          <template slot-scope="scope">
+<!--            <el-button type="primary" @click="getBaseList(1048) " style="width: 70px">点击选择</el-button>-->
+            <el-button type="primary" @click="chooseLevel(scope.row)" style="width:40%" >点击选择</el-button>
+            <el-input v-model="scope.row.samplingLevelDesc" disabled style="width:55%;"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="检验周期(h)">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.inspectionCycle" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"</el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="抽样方案">
+          <template slot-scope="scope">
+            <el-button type="primary" @click="choosePlanRow(scope.row)" style="width:40%" >点击选择</el-button>
+            <el-input v-model="scope.row.samplingPlanNo" disabled style="width:55%;"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="AQL">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.aql" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"</el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="AC">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.ac" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"</el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="RE">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.re" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"</el-input>
+          </template>
+        </el-table-column>
+
         <el-table-column
           fixed="right"
           header-align="center"
           align="center"
-          width="100"
+          width="80"
           label="操作">
           <template slot-scope="scope">
-            <a type="text" size="small"  @click="deleteModalDetails(scope.row)">删除项目</a>
+            <a type="text" size="small"  @click="deletePartAttributeDetails(scope.row)">删除模板</a>
           </template>
         </el-table-column>
 
       </el-table>
+      </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveDetail()">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
-    <!-- 检验项目->新增 -->
-    <el-dialog title="添加项目" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">
+    <!-- 检验模板->新增 -->
+    <el-dialog title="添加模板" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1034)"><a herf="#">检验项目编码</a></span>
-          <el-input v-model="detailData.itemNo"  @blur="itemNoBlur"  style="width: 120px"></el-input>
+          <span slot="label" style="" @click="getBaseList(1050)"><a herf="#">检验模板编码</a></span>
+          <el-input v-model="detailData.templateId"  @blur="itemNoBlur"  style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="检验项目名称:">
-          <el-input v-model="detailData.itemDesc"  disabled style="width: 120px"></el-input>
+          <el-input v-model="detailData.templateName"  disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="saveModalDetails()">保存</el-button>
+        <el-button type="primary" @click="savePartAttributeDetails()">保存</el-button>
         <el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -212,12 +261,31 @@
     <!-- 检验项目->快速新增 -->
     <el-dialog title="快速添加" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="800px">
       <div style="font-size: 12px">
-        检验模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>
-        检验模板名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>
+        <el-form :inline="true"  label-position="top" :model="detailData">
+          <el-form-item :label="'物料编码'">
+            <el-input v-model="detailData.partNo" readonly style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'物料名称'">
+            <el-input v-model="detailData.partDesc" readonly style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item label="检验类型">
+            <el-select v-model="detailData.inspectionTypeNo" placeholder="请选择">
+              <el-option
+                v-for = "i in options"
+                :key = "i.inspectionTypeNo"
+                :label = "i.inspectionTypeName"
+                :value = "i.inspectionTypeNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="checkInspectionType()">查询</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <el-container style="margin-top: -12px;">
         <el-main style="width: 300px">
-          <span  style="font-size: 12px" >可选项目：</span>
+          <span  style="font-size: 12px" >可选模板：</span>
           <el-table
             height="300px"
             :data="itemList1"
@@ -227,18 +295,18 @@
             v-loading="dataListLoading"
             style="width: 100%">
             <el-table-column
-              prop="itemNo"
+              prop="templateId"
               header-align="center"
               align="left"
               min-width="110"
-              label="项目编码">
+              label="模板编码">
             </el-table-column>
             <el-table-column
-              prop="itemDesc"
+              prop="templateName"
               header-align="center"
               align="left"
               min-width="170"
-              label="项目名称">
+              label="模板名称">
             </el-table-column>
           </el-table>
         </el-main>
@@ -251,7 +319,7 @@
           </div>
         </el-main>
         <el-main style="width: 300px">
-          <span  style="font-size: 12px" >已有项目：</span>
+          <span  style="font-size: 12px" >已有模板：</span>
           <el-table
             height="300px"
             :data="itemList2"
@@ -261,18 +329,18 @@
             v-loading="dataListLoading"
             style="width: 100%">
             <el-table-column
-              prop="itemNo"
+              prop="templateId"
               header-align="center"
               align="left"
               min-width="110"
-              label="项目编码">
+              label="模板编码">
             </el-table-column>
             <el-table-column
-              prop="itemDesc"
+              prop="templateName"
               header-align="center"
               align="left"
               min-width="170"
-              label="项目名称">
+              label="模板名称">
             </el-table-column>
           </el-table>
         </el-main>
@@ -288,49 +356,27 @@
 
 <script>
   import {
-    qcPartModelSearch,
-    qcPartModelSave,
+    qcPartAttributeSearch, // 查询物料属性
+    qcPartAttributeSave, // 新增物料属性
     qcPartModelUpdate,
-    qcPartModelDelete,
-    searchModalDetails,
-    saveModalDetails,
-    deleteModalDetails,
+    qcPartAttributeDelete, // 删除物料属性
+    searchPartAttributeDetails, // 查询物料属性模板
+    savePartAttributeDetails, // 新增物料属性模板
+    deletePartAttributeDetails, // 删除物料属性模板
+    saveAttributeDetailed, // 新增物料属性模板详情
     qcCheckOutItemSearch, // 搜索项目
-    getItemLists // 获取项目列表
+    getItemLists, // 获取项目列表
+    InspectionTypeSearch // 搜索所有检验类型
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import qcPartAttribute from './qcPartAttribute.vue'
   export default {
     components: {
       Chooselist
     },
     watch: {
-      searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.codeNo = this.searchData.codeNo.toUpperCase()
-        }
-      },
 
-      itemData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.itemData.itemNo = this.itemData.itemNo.toUpperCase()
-        }
-      },
-      modalData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.modalData.codeNo = this.modalData.codeNo.toUpperCase()
-        }
-      },
-      detailData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.detailData.codeNo = this.detailData.codeNo.toUpperCase()
-          this.detailData.itemNo = this.detailData.itemNo.toUpperCase()
-        }
-      }
     },
     data () {
       return {
@@ -345,15 +391,12 @@
         exportList:[],
         // 导出 end
 
-        tagNo:'',
+        tagNo: '',
         searchData: {
-          codeNo: '',
-          codeDesc: '',
           partNo: '',
           partDesc: '',
-          inspectionTypeName: '',
-          active: '',
-          functionType: 'E',
+          familyID: '',
+          attributeType: 'A',
           page: 1,
           limit: 10,
         },
@@ -366,24 +409,28 @@
         modalDisableFlag:false,
         modalData:{
           flag: '',
-          codeNo: '',
-          codeDesc: '',
           partNo: '',
           partDesc: '',
-          active: '',
-          functionType: 'E',
-          inspectionTypeNo: '',
-          inspectionTypeName: '',
-          createdBy: this.$store.state.user.name
+          familyID: '',
+          familyName: '',
+          umid: '',
+          supplierNo: '',
+          supplierDesc: '',
+          attributeRemark: '',
+          createTime: '',
+          createBy: this.$store.state.user.name,
+          attributeType: 'A',
         },
         detailData:{
-          codeNo: '',
-          codeDesc: '',
-          functionType: 'E',
-          itemNo: '',
-          itemDesc: '',
-          itemType: 'D',
-          createdBy: this.$store.state.user.name
+          site: this.$store.state.user.site,
+          partNo: '',
+          attributeNo: '',
+          partDesc: '',
+          attributeType: 'A',
+          inspectionTypeNo: '',
+          templateId: '',
+          templateName: '',
+          createBy: this.$store.state.user.name
         },
         columnList: [
           {
@@ -392,17 +439,35 @@
             serialNumber: '301003TableCodeNo',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'codeNo',
+            columnProp: 'partNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验模板编码',
+            columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 60,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableCodeNo',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'partDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60,
           },
           {
             userId: this.$store.state.user.name,
@@ -410,71 +475,71 @@
             serialNumber: '301003TableCodeDesc',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'codeDesc',
+            columnProp: 'familyName',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验模板名称',
+            columnLabel: '物料类别',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140,
+            columnWidth: 60,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003TableCodeNo',
+            serialNumber: '301003TableActive',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'partNo',
+            columnProp: 'umid',
             headerAlign: "center",
             align: "left",
-            columnLabel: '物料编码',
+            columnLabel: '规格型号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 60,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003TableCodeNo',
+            serialNumber: '301003TableActive',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'partDesc',
+            columnProp: 'supplierNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '物料名称',
+            columnLabel: '供应商',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 160,
+            columnWidth: 60,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003TableCodeDesc',
+            serialNumber: '301003TableActive',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'inspectionTypeName',
+            columnProp: 'attributeRemark',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验类型名称',
+            columnLabel: '备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
+            columnWidth: 60,
           },
           {
             userId: this.$store.state.user.name,
@@ -482,17 +547,35 @@
             serialNumber: '301003TableActive',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'active',
+            columnProp: 'createTime',
             headerAlign: "center",
             align: "left",
-            columnLabel: '在用',
+            columnLabel: '操作时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 40,
+            columnWidth: 60,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableActive',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'createBy',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '操作人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60,
           },
         ],
         detailModelFlag:false,
@@ -514,17 +597,17 @@
             serialNumber: '301003Table2EamPropertiesItemID',
             tableId: "301003Table2",
             tableName: "检验项目表",
-            columnProp: 'itemNo',
+            columnProp: 'templateId',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验项目编码',
+            columnLabel: '模板编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 90,
+            columnWidth: 70,
           },
           {
             userId: this.$store.state.user.name,
@@ -532,28 +615,10 @@
             serialNumber: '301003Table2EamPropertiesItemDesc',
             tableId: "301003Table2",
             tableName: "检验项目表",
-            columnProp: 'itemDesc',
+            columnProp: 'templateName',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验项目名称',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 90,
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 301003,
-            serialNumber: '301003Table2ValueType',
-            tableId: "301003Table2",
-            tableName: "检验项目表",
-            columnProp: 'valueType',
-            headerAlign: "center",
-            align: "left",
-            columnLabel: '检测值类型',
+            columnLabel: '模板名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -565,13 +630,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003Table2DefaultValue',
+            serialNumber: '301003Table2MinValue',
             tableId: "301003Table2",
             tableName: "检验项目表",
-            columnProp: 'defaultValue',
+            columnProp: 'inspectionTypeName',
             headerAlign: "center",
             align: "left",
-            columnLabel: '参照值',
+            columnLabel: '检验类型',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -583,13 +648,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003Table2MaxValue',
+            serialNumber: '301003Table2MinValue',
             tableId: "301003Table2",
             tableName: "检验项目表",
-            columnProp: 'maxValue',
+            columnProp: 'templateRemark',
             headerAlign: "center",
             align: "left",
-            columnLabel: '最大值',
+            columnLabel: '备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -604,10 +669,10 @@
             serialNumber: '301003Table2MinValue',
             tableId: "301003Table2",
             tableName: "检验项目表",
-            columnProp: 'minValue',
+            columnProp: 'templateVersion',
             headerAlign: "center",
             align: "left",
-            columnLabel: '最小值',
+            columnLabel: '版本号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -623,6 +688,9 @@
         itemList2:[],
         itemListRow1:{},
         itemListRow2:{},
+        tempLevelRow:'',
+        tempPlanRow:'',
+        options: [],
       }
     },
     mounted () {
@@ -635,60 +703,79 @@
       this.favoriteIsOk()
     },
     methods: {
+      // 查询检验类型
+      InspectionTypeSearch(){
+        InspectionTypeSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.options = data.rows
+          }
+        })
+      },
       // 清空搜索栏
       doEmpty(){
         this.searchData = {
-          codeNo: '',
-          codeDesc: '',
           partNo: '',
           partDesc: '',
-          active: '',
-          functionType: 'E',
-          inspectionTypeName: '',
+          familyID: '',
+          attributeType: 'A',
           page: 1,
           limit: 10,
         }
       },
-
+      chooseLevel(row){
+        this.tempLevelRow = row;
+        this.getBaseList(1048);
+      },
+      choosePlanRow(row){
+        this.tempPlanRow = row;
+        this.getBaseList(1049);
+      },
       // 获取基础数据列表S
       getBaseList (val,type) {
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 1034) {
-            strVal = this.detailData.itemNo
-            this.$refs.baseList.init(val, strVal)
-          }
           if (val === 1043) {
             strVal = this.modalData.partNo
             this.$refs.baseList.init(val, strVal)
           }
-          if (val === 1045) {
-            strVal = this.modalData.inspectionTypeNo
+          if (val === 1050) {
+            strVal = this.detailData.templateId
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 1048) {
+            strVal = this.tempLevelRow.samplingLevelNo
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 1049) {
+            strVal = this.tempPlanRow.samplingPlanNo
             this.$refs.baseList.init(val, strVal)
           }
         })
       },
       /* 列表方法的回调 */
       getBaseData (val) {
-        if (this.tagNo === 1034) {
-          this.detailData.itemNo = val.ItemNo
-          this.detailData.itemDesc = val.ItemDesc
-        }
         if (this.tagNo === 1043) {
           this.modalData.partNo = val.part_no
           this.modalData.partDesc = val.part_desc
         }
-        if (this.tagNo === 1045) {
-          this.modalData.inspectionTypeNo = val.inspection_type_no
-          this.modalData.inspectionTypeName = val.inspection_type_name
+        if (this.tagNo === 1050) {
+          this.detailData.templateId = val.template_id
+          this.detailData.templateName = val.template_name
+        }
+        if (this.tagNo === 1048) {
+          this.tempLevelRow.samplingLevelNo = val.sampling_level_no
+          this.tempLevelRow.samplingLevelDesc = val.sampling_level_desc
+        }
+        if (this.tagNo === 1049) {
+          this.tempPlanRow.samplingPlanNo = val.sampling_plan_no
         }
       },
       // 获取数据列表
       getDataList () {
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
-        qcPartModelSearch(this.searchData).then(({data}) => {
+        qcPartAttributeSearch(this.searchData).then(({data}) => {
           if (data.code == 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
@@ -712,15 +799,17 @@
       addModal(){
         this.modalData={
           flag: '1',
-          codeNo: '',
-          codeDesc: '',
-          active: '',
           partNo: '',
           partDesc: '',
-          functionType: 'E',
-          inspectionTypeNo: '',
-          inspectionTypeName: '',
-          createdBy: this.$store.state.user.name
+          familyID: '',
+          familyName: '',
+          umid: '',
+          supplierNo: '',
+          supplierDesc: '',
+          attributeRemark: '',
+          createTime: '',
+          createBy: this.$store.state.user.name,
+          attributeType: 'A',
         };
         this.modalDisableFlag = false;
         this.modalFlag = true;
@@ -728,14 +817,15 @@
       updateModal(row){
         this.modalData={
           flag: '2',
-          codeNo: row.codeNo,
-          codeDesc: row.codeDesc,
-          active: row.active,
           partNo: row.partNo,
           partDesc: row.partDesc,
-          inspectionTypeNo: row.inspectionTypeNo,
-          inspectionTypeName: row.inspectionTypeName,
-          functionType: 'E',
+          familyID: row.familyID,
+          familyName: row.familyName,
+          umid: row.umid,
+          supplierNo: row.supplierNo,
+          supplierDesc: row.supplierDesc,
+          attributeRemark: row.attributeRemark,
+          attributeType: 'A',
           createdBy: this.$store.state.user.name
         };
         this.modalDisableFlag = true;
@@ -748,7 +838,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          qcPartModelDelete(row).then(({data}) => {
+          qcPartAttributeDelete(row).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
               this.$message({
@@ -768,32 +858,14 @@
         })
       },
       saveData(){
-        if (this.modalData.codeDesc == '' || this.modalData.codeDesc == null) {
-          this.$alert('请输入检验模板名称！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
         if (this.modalData.partNo == '' || this.modalData.partNo == null) {
           this.$alert('请选择物料编码！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.inspectionTypeNo == '' || this.modalData.inspectionTypeNo == null) {
-          this.$alert('请选择检验类型！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
-        if (this.modalData.active == '' || this.modalData.active == null) {
-          this.$alert('选择是否在用！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
         if(this.modalData.flag == '1'){
-          qcPartModelSave(this.modalData).then(({data}) => {
+          qcPartAttributeSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
               this.modalFlag = false
@@ -830,11 +902,36 @@
           })
         }
       },
-      //打开检验项目清单
+      // 保存属性模板
+      saveDetail(){
+        for (let i = 0; i < this.detailList.length; i++) {
+          saveAttributeDetailed(this.detailList[i]).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.detailModelFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              }).then(() => {
+                return false
+              })
+            }
+          })
+        }
+      },
+      //打开物料模板清单
       detailModal(row){
-        this.detailData.codeNo = row.codeNo
-        this.detailData.codeDesc = row.codeDesc
-        searchModalDetails(this.detailData).then(({data}) => {
+        this.detailData.partNo = row.partNo
+        this.detailData.attributeNo = row.partNo
+        this.detailData.partDesc = row.partDesc
+        searchPartAttributeDetails(this.detailData).then(({data}) => {
           this.detailList = data.rows
         })
         this.detailModelFlag = true;
@@ -842,15 +939,22 @@
 
       // 普通新增
       addDetailModal(){
-        this.detailData.itemNo = '';
-        this.detailData.itemDesc = '';
+        this.detailData.templateId = '';
+        this.detailData.templateName = '';
         this.addDetailModalFlag = true;
       },
 
+      checkInspectionType(){
+        getItemLists(this.detailData).then(({data}) => {
+          this.itemList1 = data.row1;
+          this.itemList2 = data.row2;
+        })
+      },
       // 快速新增
       addFastModal(){
         this.itemListRow2 = null
         this.itemListRow1 = null
+        this.InspectionTypeSearch()
         getItemLists(this.detailData).then(({data}) => {
           this.itemList1 = data.row1;
           this.itemList2 = data.row2;
@@ -864,30 +968,27 @@
       clickItem2(row){
         this.itemListRow2 = JSON.parse(JSON.stringify(row));
       },
-      // 添加项目
+      // 添加模板
       addItem(){
-        if(this.itemListRow1==null){
-          this.$alert("请选择可选项目！", '错误', {
+        if(this.itemListRow1 == null){
+          this.$alert("请选择可选模板！", '错误', {
             confirmButtonText: '确定'
           })
           return false;
         }
-        let inData={
-          codeNo:this.detailData.codeNo,
-          codeDesc:this.detailData.codeDesc,
-          functionType:this.detailData.functionType,
-          itemNo: this.itemListRow1.itemNo,
-          itemDesc:this.itemListRow1.itemDesc,
-          itemType:this.detailData.itemType,
-          userId:this.$store.state.user.name
+        let inData = {
+          attributeNo: this.detailData.partNo,
+          templateId: this.itemListRow1.templateId,
+          attributeType: this.detailData.attributeType,
+          site: this.$store.state.user.site
         }
-        saveModalDetails(inData).then(({data}) => {
+        savePartAttributeDetails(inData).then(({data}) => {
           if (data && data.code == 0) {
             getItemLists(this.detailData).then(({data}) => {
               this.itemList1=data.row1;
               this.itemList2=data.row2;
             })
-            this.itemListRow1=null
+            this.itemListRow1 = null
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -895,24 +996,20 @@
           }
         })
       },
-      // 删除项目
+      // 删除模板
       deleteItem(){
         if(this.itemListRow2 == null){
-          this.$alert("请选择已选项目！", '错误', {
+          this.$alert("请选择已选模板！", '错误', {
             confirmButtonText: '确定'
           })
           return false;
         }
         let inData = {
-          codeNo:this.detailData.codeNo,
-          codeDesc:this.detailData.codeDesc,
-          functionType:this.detailData.functionType,
-          itemNo: this.itemListRow2.itemNo,
-          itemDesc:this.itemListRow2.itemDesc,
-          itemType:this.detailData.itemType,
-          userId:this.$store.state.user.name
+          attributeNo:this.detailData.partNo,
+          templateId: this.itemListRow2.templateId,
+          site:this.$store.state.user.site
         }
-        deleteModalDetails(inData).then(({data}) => {
+        deletePartAttributeDetails(inData).then(({data}) => {
           if (data && data.code === 0) {
             getItemLists(this.detailData).then(({data}) => {
               this.itemList1 = data.row1;
@@ -928,25 +1025,25 @@
       },
       // 关闭后刷新列表
       refreshDetailList(){
-        searchModalDetails(this.detailData).then(({data}) => {
+        searchPartAttributeDetails(this.detailData).then(({data}) => {
           this.detailList = data.rows
         })
       },
 
-      // 保存模板中的项目明细
-      saveModalDetails(){
-        if(this.detailData.itemNo == "" || this.detailData.itemNo == null){
-          this.$alert('请选择检验项目编码！', '错误', {
+      // 保存物料属性中的模板明细
+      savePartAttributeDetails(){
+        if(this.detailData.templateId == "" || this.detailData.templateId == null){
+          this.$alert('请选择检验模板！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        saveModalDetails(this.detailData).then(({data}) => {
+        savePartAttributeDetails(this.detailData).then(({data}) => {
           if (data && data.code == 0) {
-            searchModalDetails(this.detailData).then(({data}) => {
+            searchPartAttributeDetails(this.detailData).then(({data}) => {
               this.detailList = data.rows
             })
-            this.addDetailModalFlag=false;
+            this.addDetailModalFlag = false;
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -967,24 +1064,23 @@
           itemNo: this.detailData.itemNo
         }
         qcCheckOutItemSearch(inData).then(({data}) => {
-         if(data.rows.length>0){
+         if(data.rows.length > 0){
            this.detailData.itemDesc = data.rows[0].itemDesc
          }else {
            this.detailData.itemDesc = ''
          }
         })
       },
-      // 删除模板中的项目
-      deleteModalDetails(row){
-        console.log(row)
-        this.$confirm(`是否删除这个检验项目?`, '提示', {
+      // 删除物料属性中的模板
+      deletePartAttributeDetails(row){
+        this.$confirm(`是否删除这个检验模板?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteModalDetails(row).then(({data}) => {
+          deletePartAttributeDetails(row).then(({data}) => {
             if (data && data.code === 0) {
-              searchModalDetails(this.detailData).then(({data}) => {
+              searchPartAttributeDetails(this.detailData).then(({data}) => {
                 this.detailList = data.rows
               })
               this.$message({
@@ -1053,8 +1149,8 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await qcPartModelSearch(this.searchData).then(({data}) => {
-          this.exportList= data.rows;
+        await qcPartAttributeSearch(this.searchData).then(({data}) => {
+          this.exportList= data.page.list;
         })
 
         return this.exportList;
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index 8fe39c1..5b9bbb9 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -14,7 +14,6 @@
       <el-form-item :label="'检验模板名称'">
         <el-input v-model="searchData.templateName"  style="width: 120px"></el-input>
       </el-form-item>
-
       <el-form-item label="检验类型">
         <el-select v-model="searchData.inspectionTypeNo" placeholder="请选择">
           <el-option
@@ -25,7 +24,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item  :label="' '">
         <el-button @click="doEmpty()">清空</el-button>
         <el-button type="primary" @click="getDataList()">查询</el-button>
@@ -76,7 +74,7 @@
         width="160"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="updateModal(scope.row)">编辑</a>
           <a type="text" size="small" @click="detailModal(scope.row)">检验项目</a>
           <a type="text" size="small" @click="deleteModel(scope.row)">删除</a>
         </template>
@@ -101,18 +99,11 @@
         <el-form-item label="检验模板名称:">
           <el-input v-model="modalData.templateName"  style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1049)"><a herf="#">抽样方案</a></span>
-          <el-input v-model="modalData.samplingPlanNo" style="width: 120px"></el-input>
+        <el-form-item label="检验周期:">
+          <el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="版本号:">
-          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 120px"></el-input>
-        </el-form-item>
-      </el-form>
-
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="检验类型">
-          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择">
+          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
             <el-option
               v-for = "i in options"
               :key = "i.inspectionTypeNo"
@@ -124,8 +115,16 @@
       </el-form>
 
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验模板备注:">
-          <el-input v-model="modalData.templateRemark"  style="width: 390px"></el-input>
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(1049)"><a herf="#">抽样方案</a></span>
+          <el-input v-model="modalData.samplingPlanNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span>
+          <el-input v-model="modalData.samplingLevelNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验水平名称:">
+          <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
 
@@ -141,13 +140,22 @@
         </el-form-item>
       </el-form>
 
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="版本号:">
+          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验模板备注:">
+          <el-input v-model="modalData.templateRemark"  style="width: 255px"></el-input>
+        </el-form-item>
+      </el-form>
+
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
-    <!-- 检验明细 -->
+    <!-- 检验项目 -->
     <el-dialog title="检验项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="820px">
       <el-form :inline="true"  label-position="top"  @keyup.enter.native="getDataList()">
         <el-form-item :label="'检验模板编码'">
@@ -157,8 +165,7 @@
           <el-input v-model="detailData.templateName"  readonly style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button  type="primary" @click="addDetailModal()">新增</el-button>
-          <el-button  type="primary" @click="addFastModal()">快速新增</el-button>
+          <el-button  type="primary" @click="addFastModal()">新增</el-button>
         </el-form-item>
       </el-form>
       <!-- 检验项目展示列表 -->
@@ -190,7 +197,7 @@
           header-align="center"
           align="right"
           min-width="80"
-          label="参照值">
+          label="标准值">
           <template slot-scope="scope">
             <el-input v-model="scope.row.defaultValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
@@ -200,7 +207,7 @@
           header-align="center"
           align="right"
           min-width="80"
-          label="最大值">
+          label="上限值">
           <template slot-scope="scope">
             <el-input v-if="scope.row.valueTypeDb == 'T'" v-model="scope.row.maxValue" disabled style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
             <el-input v-if="scope.row.valueTypeDb != 'T'" v-model="scope.row.maxValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
@@ -211,12 +218,29 @@
           header-align="center"
           align="right"
           min-width="80"
-          label="最小值">
+          label="下限值">
           <template slot-scope="scope">
             <el-input v-if="scope.row.valueTypeDb == 'T'" v-model="scope.row.minValue" disabled style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
             <el-input v-if="scope.row.valueTypeDb != 'T'" v-model="scope.row.minValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="right"
+          min-width="80"
+          label="检验设备">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.objectID" placeholder="请选择" >
+              <el-option
+                v-for = "i in objects"
+                :key = "i.objectID"
+                :label = "i.objectDesc"
+                :value = "i.objectID">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column
           fixed="right"
           header-align="center"
@@ -224,7 +248,7 @@
           width="100"
           label="操作">
           <template slot-scope="scope">
-            <a type="text" size="small"  @click="delItemDetails(scope.row)">删除明细</a>
+            <a type="text" size="small"  @click="delItemDetails(scope.row)">删除项目</a>
           </template>
         </el-table-column>
 
@@ -236,23 +260,6 @@
       </el-footer>
     </el-dialog>
 
-    <!-- 检验明细->新增 -->
-    <el-dialog title="添加项目" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1034)"><a herf="#">检验明细编码</a></span>
-          <el-input v-model="detailData.itemNo"  @blur="itemNoBlur"  style="width: 120px"></el-input>
-        </el-form-item>
-        <el-form-item label="检验项目名称:">
-          <el-input v-model="detailData.itemDesc"  disabled style="width: 120px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="addItemDetails()">保存</el-button>
-        <el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>
-      </el-footer>
-    </el-dialog>
-
     <!-- 检验项目->快速新增 -->
     <el-dialog title="快速添加" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="800px">
       <div style="font-size: 12px">
@@ -368,6 +375,7 @@
     templateUpdate, // 修改模板
     templateDelete, // 删除模板
     InspectionTypeSearch, // 搜索所有检验类型
+    objectSearch, // 搜索所有设备
     ItemDetailsSearch, // 查询明细列表
     addItemDetails, // 新增项目的检验明细
     getItemList, // 获取明细列表
@@ -408,6 +416,7 @@
           limit: 10,
         },
         options: [],
+        objects: [],
         height: 200,
         pageIndex: 1,
         pageSize: 100,
@@ -425,8 +434,11 @@
           templateVersion: '',
           samplingPlanNo: '',
           inspectionTypeNo: '',
+          inspectionCycle: '',
           createTime: '',
           createBy: this.$store.state.user.name,
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
           aql: '',
           ac: '',
           re: '',
@@ -440,8 +452,11 @@
           templateVersion: '',
           samplingPlanNo: '',
           inspectionTypeNo: '',
+          inspectionCycle: '',
           createTime: '',
           createBy: this.$store.state.user.name,
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
           aql: '',
           ac: '',
           re: '',
@@ -489,20 +504,20 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301003,
-            serialNumber: '301003TableCodeNo',
+            serialNumber: '301003TableCodeDesc',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'templateRemark',
+            columnProp: 'samplingPlanNo',
             headerAlign: "center",
             align: "left",
-            columnLabel: '检验模板备注',
+            columnLabel: '抽样方案',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -510,10 +525,64 @@
             serialNumber: '301003TableCodeDesc',
             tableId: "301003Table",
             tableName: "检验模板表",
-            columnProp: 'samplingPlanNo',
+            columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '抽样方案',
+            columnLabel: '检验水平',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableCodeDesc',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'inspectionCycle',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验周期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableCodeDesc',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'defaultSamplingQuantity',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '默认抽样数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableCodeDesc',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'defaultSamplingProportion',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '默认抽样比例',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -594,6 +663,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301003,
+            serialNumber: '301003TableCodeNo',
+            tableId: "301003Table",
+            tableName: "检验模板表",
+            columnProp: 'templateRemark',
+            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: 301003,
@@ -723,60 +810,6 @@
             fixed: '',
             columnWidth: 70,
           },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 301003,
-          //   serialNumber: '301003Table2DefaultValue',
-          //   tableId: "301003Table2",
-          //   tableName: "检验项目表",
-          //   columnProp: 'defaultValue',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '参照值',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 70,
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 301003,
-          //   serialNumber: '301003Table2MaxValue',
-          //   tableId: "301003Table2",
-          //   tableName: "检验项目表",
-          //   columnProp: 'maxValue',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '最大值',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 70,
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 301003,
-          //   serialNumber: '301003Table2MinValue',
-          //   tableId: "301003Table2",
-          //   tableName: "检验项目表",
-          //   columnProp: 'minValue',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '最小值',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 70,
-          // },
         ],
         levelList:[],
         chooseModalData:{
@@ -813,6 +846,15 @@
         })
       },
 
+      // 查询设备
+      objectSearch(){
+        objectSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.objects = data.rows
+          }
+        })
+      },
+
       // 清空搜索栏
       doEmpty(){
         this.searchData = {
@@ -834,8 +876,8 @@
             strVal = this.modalData.samplingPlanNo
             this.$refs.baseList.init(val, strVal)
           }
-          if (val === 1034) {
-            strVal = this.detailData.itemNo
+          if (val === 1048) {
+            strVal = this.detailData.samplingLevelNo
             this.$refs.baseList.init(val, strVal)
           }
         })
@@ -845,9 +887,9 @@
         if (this.tagNo === 1049) {
           this.modalData.samplingPlanNo = val.sampling_plan_no
         }
-        if (this.tagNo === 1034) {
-          this.detailData.itemNo = val.ItemNo
-          this.detailData.itemDesc = val.ItemDesc
+        if (this.tagNo === 1048) {
+          this.modalData.samplingLevelNo = val.sampling_level_no
+          this.modalData.samplingLevelDesc = val.sampling_level_desc
         }
       },
       // 获取数据列表
@@ -886,7 +928,10 @@
           templateVersion: '',
           samplingPlanNo: '',
           inspectionTypeNo: '',
+          inspectionCycle: '',
           createBy: this.$store.state.user.name,
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
           aql: '',
           ac: '',
           re: ''
@@ -906,6 +951,9 @@
           samplingPlanNo: row.samplingPlanNo,
           inspectionTypeNo: row.inspectionTypeNo,
           createBy: this.$store.state.user.name,
+          samplingLevelNo: row.samplingLevelNo,
+          samplingLevelDesc: row.samplingLevelDesc,
+          inspectionCycle: row.inspectionCycle,
           aql: row.aql,
           ac: row.ac,
           re: row.re,
@@ -952,14 +1000,14 @@
           })
           return false
         }
-        if (this.modalData.templateVersion == '' || this.modalData.templateVersion == null) {
-          this.$alert('请输入版本号！', '错误', {
+        if (this.modalData.inspectionTypeNo == '' || this.modalData.inspectionTypeNo == null) {
+          this.$alert('请选择检验类型！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.inspectionTypeNo == '' || this.modalData.inspectionTypeNo == null) {
-          this.$alert('请选择检验类型！', '错误', {
+        if (this.modalData.samplingLevelNo == '' || this.modalData.samplingLevelNo == null) {
+          this.$alert('请选择检验水平！', '错误', {
             confirmButtonText: '确定'
           })
           return false
@@ -1026,13 +1074,13 @@
         this.detailData.templateName = row.templateName
         ItemDetailsSearch(this.detailData).then(({data}) => {
           this.detailList = data.rows
+          this.objectSearch()
         })
         this.detailModelFlag = true;
       },
-      // 保存项目明细
+      // 保存模板项目
       saveDetail(){
         for (let i = 0; i < this.detailList.length; i++) {
-          if (this.detailList[i].valueTypeDb == 'N'){
             saveItemDetailed(this.detailList[i]).then(({data}) => {
               if (data && data.code === 0) {
                 this.getDataList()
@@ -1052,16 +1100,15 @@
                 })
               }
             })
-          }
         }
       },
 
       // 普通新增
-      addDetailModal(){
-        this.detailData.itemNo = '';
-        this.detailData.itemDesc = '';
-        this.addDetailModalFlag = true;
-      },
+      // addDetailModal(){
+      //   this.detailData.itemNo = '';
+      //   this.detailData.itemDesc = '';
+      //   this.addDetailModalFlag = true;
+      // },
 
       // 快速新增
       addFastModal(){