From 611d75d4c41531b8c3811c9a268c30484ceeb14a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 13 Dec 2023 13:59:26 +0800
Subject: [PATCH] =?UTF-8?q?2023-12-13=20=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=AD=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=8A=BD=E6=A0=B7?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E3=80=81=E9=BB=98=E8=AE=A4=E6=8A=BD=E6=A0=B7?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/eamWorkPlanForMaintenance.vue |   2 +-
 src/views/modules/qc/FAIResultEntry.vue       |  46 +++++--
 src/views/modules/qc/FQCResultEntry.vue       |  44 ++++--
 src/views/modules/qc/IPQCResultEntry.vue      |  38 ++++--
 src/views/modules/qc/IQCResultEntry.vue       |  42 +++---
 src/views/modules/qc/qcItem.vue               | 127 +++++++++++++++---
 src/views/modules/qc/qcTemplate.vue           |  15 +--
 .../reportWorkOrder/reportCheckOrder.vue      |   2 +-
 .../reportMaintenanceOrder.vue                |   2 +-
 .../modules/sys/sceneDynamicControlModel.vue  |   4 +-
 10 files changed, 237 insertions(+), 85 deletions(-)

diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index ec920b6..c5af90d 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -80,7 +80,7 @@
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed===''?false:item.fixed"
+        :fixed="item.fixed==''?false:item.fixed"
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 685fa18..527a4e5 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -7,37 +7,56 @@
         </span>
     </div>
     <!-- 条件查询 -->
-    <el-form :inline="true"  label-position="top" :model="searchData" >
+    <el-form :inline="true"  label-position="top" :model="searchData">
       <el-form-item :label="'检验单号'">
-        <el-input v-model="searchData.inspectionNo" style="width: 100px"></el-input>
+        <el-input v-model="searchData.inspectionNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工单号'">
+        <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序'">
+        <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
-        <el-select v-model="searchData.state" style="width: 100px">
+        <el-select v-model="searchData.state" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="待检验" value="待检验"></el-option>
           <el-option label="待审核" value="待审核"></el-option>
           <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true"  label-position="top" :model="searchData">
       <el-form-item :label="'检验结论'">
-        <el-select v-model="searchData.inspectionResult" style="width: 100px">
+        <el-select v-model="searchData.inspectionResult" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="合格" value="合格"></el-option>
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'工单号'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'工序'">
-        <el-input v-model="searchData.operationDesc" style="width: 120px"></el-input>
+      <el-form-item :label="'处置措施'">
+        <el-select v-model="searchData.disposalMeasures" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for = "i in disposalMeasuresOptions"
+            :key = "i.id"
+            :label = "i.disposalMeasures"
+            :value = "i.disposalMeasures">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item :label="'检验时间：'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime"
+      <el-form-item :label="'检验时间'">
+        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
         </el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime"
+        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
@@ -747,6 +766,9 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          partNo: '',
+          partDesc: '',
+          disposalMeasures: '',
           page: 1,
           limit: 10,
         },
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index c977807..d2a70bd 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -7,37 +7,56 @@
         </span>
     </div>
     <!-- 条件查询 -->
-    <el-form :inline="true"  label-position="top" :model="searchData" >
+    <el-form :inline="true"  label-position="top" :model="searchData">
       <el-form-item :label="'检验单号'">
-        <el-input v-model="searchData.inspectionNo" style="width: 100px"></el-input>
+        <el-input v-model="searchData.inspectionNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工单号'">
+        <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序'">
+        <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
-        <el-select v-model="searchData.state" style="width: 100px">
+        <el-select v-model="searchData.state" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="待检验" value="待检验"></el-option>
           <el-option label="待审核" value="待审核"></el-option>
           <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'检验结论'">
-        <el-select v-model="searchData.inspectionResult" style="width: 100px">
+        <el-select v-model="searchData.inspectionResult" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="合格" value="合格"></el-option>
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'工单号'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'工序'">
-        <el-input v-model="searchData.operationDesc" style="width: 120px"></el-input>
+      <el-form-item :label="'处置措施'">
+        <el-select v-model="searchData.disposalMeasures" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for = "i in disposalMeasuresOptions"
+            :key = "i.id"
+            :label = "i.disposalMeasures"
+            :value = "i.disposalMeasures">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'检验时间：'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime"
+        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
         </el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime"
+        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
@@ -746,6 +765,9 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          partNo: '',
+          partDesc: '',
+          disposalMeasures: '',
           page: 1,
           limit: 10,
         },
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 0343579..4f5f9c8 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -14,6 +14,15 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工单号'">
+        <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序'">
+        <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
+      </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 100px">
           <el-option label="全部" value=""></el-option>
@@ -29,8 +38,10 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'检验类型'">
-        <el-select v-model="searchData.inspectionTypeNo" style="width: 100px">
+        <el-select v-model="searchData.inspectionTypeNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="IPQC首检" value="101"></el-option>
           <el-option label="IPQC自检" value="102"></el-option>
@@ -38,18 +49,21 @@
           <el-option label="IPQC末件检" value="104"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'工单号'">
-        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item :label="'工序'">
-        <el-input v-model="searchData.operationDesc" clearable style="width: 120px"></el-input>
+      <el-form-item :label="'处置措施'">
+        <el-select v-model="searchData.disposalMeasures" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for = "i in disposalMeasuresOptions"
+            :key = "i.id"
+            :label = "i.disposalMeasures"
+            :value = "i.disposalMeasures">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'检验时间：'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button type="primary" @click="getDataList()">查询</el-button>
@@ -765,6 +779,8 @@
           endDate: '',
           inspectionTypeNo: '',
           partNo: '',
+          partDesc: '',
+          disposalMeasures: '',
           page: 1,
           limit: 10,
         },
@@ -2391,7 +2407,7 @@
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
         qcIPQCInspectionSearch(this.searchData).then(({data}) => {
-          if (data.code == 0) {
+          if (data.code === 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
             this.pageSize = data.page.pageSize
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index a244975..901f857 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -11,8 +11,22 @@
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" >
       <el-form-item :label="'检验单号'">
-        <el-input v-model="searchData.inspectionNo" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.inspectionNo" clearable style="width: 140px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料编码'">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 233px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'供应商'">
+        <el-input v-model="searchData.supplierDesc" clearable style="width: 221px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'质检员'">
+        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" >
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 100px">
           <el-option label="全部" value=""></el-option>
@@ -28,31 +42,21 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'物料编码'">
-        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商'">
-        <el-input v-model="searchData.supplierDesc" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="缺少备件" value="缺少备件"></el-option>
-          <el-option label="等待售后" value="等待售后"></el-option>
-          <el-option label="远程协助" value="远程协助"></el-option>
-          <el-option label="换班换人" value="换班换人"></el-option>
+          <el-option
+            v-for = "i in disposalMeasuresOptions"
+            :key = "i.id"
+            :label = "i.disposalMeasures"
+            :value = "i.disposalMeasures">
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'质检员'">
-        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'检验时间'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button type="primary" @click="getDataList()">查询</el-button>
diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue
index de680d4..32eee97 100644
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -62,7 +62,7 @@
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed === '' ? false : item.fixed"
+        :fixed="item.fixed == '' ? false : item.fixed"
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
@@ -121,23 +121,45 @@
           <span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span>
           <el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
         </el-form-item>
-        <el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
-          <el-input v-model="modalData.methodName" disabled style="width: 143px"></el-input>
+        <el-form-item label="方法名称" prop="methodName" :rules="rules.methodNameType">
+          <el-input v-model="modalData.methodName" disabled style="width: 300px"></el-input>
         </el-form-item>
-        <el-form-item label="抽样数量:">
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
+          <span slot="label" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span>
+          <el-input v-model="modalData.samplingProgrammeNo" style="width: 143px"></el-input>
+        </el-form-item>
+        <el-form-item label="抽样方案名称">
+          <el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 300px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
+          <span slot="label" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span>
+          <el-input v-model="modalData.samplingLevelNo" style="width: 143px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验水平名称">
+          <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 300px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="抽样数量">
           <el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>
         </el-form-item>
+        <el-form-item label="抽样比例%">
+          <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></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-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="参照值">
           <el-input v-model="modalData.defaultValue" style="width: 143px"></el-input>
-<!--          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 143px"></el-input>-->
         </el-form-item>
-        <el-form-item label="最大值:">
+        <el-form-item label="最大值">
           <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 143px"></el-input>
           <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 143px"></el-input>
         </el-form-item>
-        <el-form-item label="最小值:">
+        <el-form-item label="最小值">
           <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 143px"></el-input>
           <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 143px"></el-input>
         </el-form-item>
@@ -228,7 +250,12 @@
           methodName: '',
           updateBy: '',
           inspectionTypeNo: '',
-          itemSamplingQuantity: ''
+          itemSamplingQuantity: '',
+          samplingProgrammeNo: '',
+          samplingProgrammeDesc: '',
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
+          defaultSamplingProportion: ''
         },
         // 检验项目展示标头
         columnList: [
@@ -340,6 +367,30 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'samplingProgrammeDesc',
+            headerAlign: 'center',
+            align: "center",
+            columnLabel: '抽样方案',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'samplingLevelDesc',
+            headerAlign: 'center',
+            align: "center",
+            columnLabel: '检验水平',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'itemSamplingQuantity',
             headerAlign: 'center',
@@ -352,6 +403,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'defaultSamplingProportion',
+            headerAlign: 'center',
+            align: "right",
+            columnLabel: '抽样比例',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'createdDate',
             headerAlign: 'center',
@@ -496,6 +559,14 @@
             strVal = this.modalData.methodNo
             this.$refs.baseList.init(val, strVal)
           }
+          if (val === 1051) {
+            strVal = this.modalData.samplingProgrammeNo
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 1048) {
+            strVal = this.modalData.samplingLevelNo
+            this.$refs.baseList.init(val, strVal)
+          }
         })
       },
       // 每页数
@@ -526,6 +597,14 @@
           this.modalData.methodNo = val.method_no
           this.modalData.methodName = val.method_name
         }
+        if (this.tagNo === 1051) {
+          this.modalData.samplingProgrammeNo = val.sampling_programme_no
+          this.modalData.samplingProgrammeDesc = val.sampling_programme_desc
+        }
+        if (this.tagNo === 1048) {
+          this.modalData.samplingLevelNo = val.sampling_level_no
+          this.modalData.samplingLevelDesc = val.sampling_level_desc
+        }
       },
       // 获取数据列表
       getDataList () {
@@ -555,7 +634,12 @@
           methodName: '',
           updateBy: '',
           inspectionTypeNo: '',
-          itemSamplingQuantity: ''
+          itemSamplingQuantity: '',
+          samplingProgrammeNo: '',
+          samplingProgrammeDesc: '',
+          samplingLevelNo: '',
+          samplingLevelDesc: '',
+          defaultSamplingProportion: ''
         }
         this.modalDisableFlag = false
         this.modalFlag = true
@@ -577,7 +661,12 @@
           methodName: row.methodName,
           updateBy: this.$store.state.user.name,
           inspectionTypeNo: row.inspectionTypeNo,
-          itemSamplingQuantity: row.itemSamplingQuantity
+          itemSamplingQuantity: row.itemSamplingQuantity,
+          samplingProgrammeNo: row.samplingProgrammeNo,
+          samplingProgrammeDesc: row.samplingProgrammeDesc,
+          samplingLevelNo: row.samplingLevelNo,
+          samplingLevelDesc: row.samplingLevelDesc,
+          defaultSamplingProportion: row.defaultSamplingProportion
         }
         this.modalDisableFlag = true
         this.modalFlag = true
@@ -625,6 +714,14 @@
           this.$message.warning('请选择检验方法！')
           return
         }
+        if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.itemSamplingQuantity === '' || this.modalData.itemSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
+          this.$message.warning('抽样方案、抽样数量、抽样比例至少选择一项！')
+          return
+        }
+        if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) {
+          this.$message.warning('请选择检验水平！')
+          return
+        }
         if (this.modalData.flag === '1') {
           qcItemSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
@@ -634,8 +731,7 @@
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                }
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {
@@ -652,8 +748,7 @@
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                }
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index cae20f9..823b218 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -168,7 +168,7 @@
     </el-dialog>
 
     <!-- 检验项目 -->
-    <el-dialog title="检验项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="820px">
+    <el-dialog title="检验项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'检验模板编码'">
           <el-input v-model="detailData.templateId" readonly style="width: 120px"></el-input>
@@ -239,17 +239,9 @@
           prop=""
           header-align="center"
           align="right"
-          min-width="100"
+          width="220"
           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>-->
             <el-autocomplete
               clearable
               class="inline-input"
@@ -262,6 +254,7 @@
               @clear="blurForBug()"
               @select="handleSelect"
               :popper-append-to-body="false"
+              style="width: 210px"
             ></el-autocomplete>
           </template>
         </el-table-column>
@@ -924,7 +917,7 @@
             this.$refs.baseList.init(val, strVal)
           }
           if (val === 1048) {
-            strVal = this.detailData.samplingLevelNo
+            strVal = this.modalData.samplingLevelNo
             this.$refs.baseList.init(val, strVal)
           }
         })
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index d4535cc..9bab901 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -97,7 +97,7 @@
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed===''?false:item.fixed"
+        :fixed="item.fixed==''?false:item.fixed"
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index ea194e2..dc340a5 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -252,7 +252,7 @@
               :header-align="item.headerAlign"
               :show-overflow-tooltip="item.showOverflowTooltip"
               :align="item.align"
-              :fixed="item.fixed===''?false:item.fixed"
+              :fixed="item.fixed==''?false:item.fixed"
               :min-width="item.columnWidth"
               :label="item.columnLabel">
               <template slot-scope="scope">
diff --git a/src/views/modules/sys/sceneDynamicControlModel.vue b/src/views/modules/sys/sceneDynamicControlModel.vue
index 966a8aa..e3ae30b 100644
--- a/src/views/modules/sys/sceneDynamicControlModel.vue
+++ b/src/views/modules/sys/sceneDynamicControlModel.vue
@@ -60,7 +60,7 @@
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed === '' ? false : item.fixed"
+        :fixed="item.fixed == '' ? false : item.fixed"
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
@@ -154,7 +154,7 @@
             :header-align="item.headerAlign"
             :show-overflow-tooltip="item.showOverflowTooltip"
             :align="item.align"
-            :fixed="item.fixed === '' ? false : item.fixed"
+            :fixed="item.fixed == '' ? false : item.fixed"
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">