修改

src/views/approveManagement/components/batchApprove.vue

@@ -2,69 +2,37 @@
 <template>
   <div class="examination">
     <div class="common-head-search">
-      <el-form
-        :inline="true"
-        ref="searchForm"
-        class="demo-form-inline sui-search-form"
-        @submit.native.prevent
-      >
+      <el-form :inline="true" ref="searchForm" class="demo-form-inline sui-search-form" @submit.native.prevent>
         <el-form-item label="物料类型">
-          <el-select
-            v-model="search.matClassNo"
-            @change="selctMatName"
-            clearable
-            style="width: 100%"
-            filterable
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in matClassNameType"
-              :key="index"
-              :label="item.matClassName"
-              :value="item.matClassNo"
-            >
+          <el-select v-model="search.matClassNo" @change="selctMatName" clearable style="width: 100%" filterable
+            collapse-tags size="small">
+            <el-option v-for="(item, index) in matClassNameType" :key="index" :label="item.matClassName"
+              :value="item.matClassNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-select
-            v-model="search.matNo"
-            clearable
-            style="width: 100%"
-            filterable
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in matNameType"
-              :key="index"
-              :label="item.matName"
-              :value="item.matNo"
-            >
+          <el-select v-model="search.matNo" clearable style="width: 100%" filterable collapse-tags size="small">
+            <el-option v-for="(item, index) in matNameType" :key="index" :label="item.matName" :value="item.matNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="分析项目">
-          <el-select
-            v-model="search.anlyItemNo"
-            clearable
-            style="width: 100%"
-            filterable
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in anlyType"
-              :key="index"
-              :label="item.anlyItemName"
-              :value="item.anlyItemNo"
-            >
+          <el-select v-model="search.anlyItemNo" clearable style="width: 100%" filterable collapse-tags size="small">
+            <el-option v-for="(item, index) in anlyType" :key="index" :label="item.anlyItemName"
+              :value="item.anlyItemNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验日期">
-          <el-date-picker
+          <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="search.times"
             type="daterange"
             range-separator="至"
@@ -75,248 +43,80 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            size="mini"
-            :disable="disSearch"
-            @click="searchData"
-            >查询</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            type="info"
-            plain
-            size="mini"
-            :disable="disSearch"
-            @click="resetData"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" size="mini" :disable="disSearch"
+            @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable="disSearch"
+            @click="resetData">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="common-title-div">
       <div class="common-title-name">
-        <img
-          style="width: 25px; height: 25px"
-          src="../../../assets/img/imgScreen/logo.png"
-        />
+        <img style="width: 25px; height: 25px" src="../../../assets/img/imgScreen/logo.png" />
         批量审核
       </div>
       <div>
-        <el-button
-          icon="el-icon-check"
-          type="goon"
-          size="mini"
-          :loading="buttonLoading1"
-          v-privilege="activeMenu + 'audit'"
-          @click="audit"
-          >审批</el-button
-        >
-        <el-button
-          icon="el-icon-remove-outline"
-          type="danger"
-          :loading="buttonLoading2"
-          @click="cancel"
-          v-privilege="activeMenu + 'cancel'"
-          size="mini"
-          >取消</el-button
-        >
-        <el-button
-          icon="el-icon-remove-outline"
-          type="danger"
-          :loading="buttonLoading3"
-          size="mini"
-          v-privilege="activeMenu + 'abnormal'"
-          @click="abnormal"
-          >异常</el-button
-        >
+        <el-button icon="el-icon-check" type="goon" size="mini" :loading="buttonLoading1"
+          v-privilege="activeMenu + 'audit'" @click="audit">审批</el-button>
+        <el-button icon="el-icon-remove-outline" type="danger" :loading="buttonLoading2" @click="cancel"
+          v-privilege="activeMenu + 'cancel'" size="mini">取消</el-button>
+        <el-button icon="el-icon-remove-outline" type="danger" :loading="buttonLoading3" size="mini"
+          v-privilege="activeMenu + 'abnormal'" @click="abnormal">异常</el-button>
       </div>
       <div class="common-button-div"></div>
       <div></div>
     </div>
     <div class="common-table-div">
       <div id="table1">
-        <el-table
-          ref="tableMain"
-          :height="theight1"
-          v-loading="tableLoading1"
-          :data="tableData1"
-          @selection-change="searchFollow"
-          highlight-current-row
-          :cell-class-name="tableRowClassName"
-          :summary-method="getSummaries"
-          :header-cell-style="tableHeaderCellStyle"
-          show-summary
-          border
-          style="width: 100%"
-          :icorePanelShown="100"
-          :icore-filter-flag="icoreFilterFlag"
-        >
-          <el-table-column
-            type="index"
-            label="NO"
-            align="center"
-            width="50"
-          ></el-table-column>
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop="stateFlagName"
-            label="状态"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="100"
-            prop="sampleNo"
-            label="检验日期"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="100"
-            prop="matClassName"
-            label="物料类型"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="100"
-            prop="matName"
-            label="物料名称"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="100"
-            prop="receivedDate"
-            label="收样日期"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop="batchNo"
-            label="批次号"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop=""
-            label="主品味1"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop=""
-            label="主品味2"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop=""
-            label="平均值"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop=""
-            label="超值值"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop="auditMan"
-            label="审核人"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="140"
-            prop="auditTime"
-            label="审核时间"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="80"
-            prop="memo"
-            label="备注"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="95px"
-            prop="createMan"
-            label="创建人"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="160px"
-            prop="createTime"
-            label="创建时间"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="95px"
-            prop="updateMan"
-            label="修改人"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            :show-overflow-tooltip="true"
-            align="center"
-            min-width="160px"
-            prop="updateTime"
-            label="修改时间"
-          ></el-table-column>
+        <el-table ref="tableMain" :height="theight1" v-loading="tableLoading1" :data="tableData1"
+          @selection-change="searchFollow" highlight-current-row :cell-class-name="tableRowClassName"
+          :summary-method="getSummaries" :header-cell-style="tableHeaderCellStyle" show-summary border
+          style="width: 100%" :icorePanelShown="100" :icore-filter-flag="icoreFilterFlag">
+          <el-table-column type="index" label="NO" align="center" width="50"></el-table-column>
+          <el-table-column type="selection" width="55" align="center"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop="stateFlagName"
+            label="状态"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="100" prop="sampleNo"
+            label="检验日期"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="100" prop="matClassName"
+            label="物料类型"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="100" prop="matName"
+            label="物料名称"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="100" prop="receivedDate"
+            label="收样日期"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop="batchNo"
+            label="批次号"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop=""
+            label="主品味1"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop=""
+            label="主品味2"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop=""
+            label="平均值"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop=""
+            label="超值值"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop="auditMan"
+            label="审核人"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="140" prop="auditTime"
+            label="审核时间"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="80" prop="memo"
+            label="备注"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="95px" prop="createMan"
+            label="创建人"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="160px" prop="createTime"
+            label="创建时间"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="95px" prop="updateMan"
+            label="修改人"></el-table-column>
+          <el-table-column sortable :show-overflow-tooltip="true" align="center" min-width="160px" prop="updateTime"
+            label="修改时间"></el-table-column>
         </el-table>
       </div>
       <div class="common-foot-style">
-        <el-pagination
-          @size-change="handleSizeChangeMain"
-          @current-change="handleCurrentChangeMain"
-          :current-page="pageIndex"
-          :page-sizes="[10, 20, 30, 40, 100, 200]"
-          :page-size="pageSize"
-          size="mini"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total_main"
-          background
-        ></el-pagination>
+        <el-pagination @size-change="handleSizeChangeMain" @current-change="handleCurrentChangeMain"
+          :current-page="pageIndex" :page-sizes="[10, 20, 30, 40, 100, 200]" :page-size="pageSize" size="mini"
+          layout="total, sizes, prev, pager, next, jumper" :total="total_main" background></el-pagination>
       </div>
     </div>
   </div>
@@ -473,7 +273,7 @@ export default {
             this.axios
               .post(
                 "pass/baseManagement/v1/sysorgs/getSysOrgChildList?orgCode=" +
-                  res.data.sectionNo
+                res.data.sectionNo
               )
               .then((res) => {
                 if (res.code == 0 || res.code == 200) {
@@ -526,7 +326,7 @@ export default {
       this.axios
         .post(
           "pass/testManagement/v1/limssamplereleases/approveLimsSampleRelease" +
-            this.click_main,
+          this.click_main,
           { individualType: "json" }
         )
         .then((res) => {
@@ -559,7 +359,7 @@ export default {
       this.axios
         .post(
           "pass/testManagement/v1/limssamplereleases/cancelLimsSampleRelease?id=" +
-            this.click_main.id,
+          this.click_main.id,
           { individualType: "json" }
         )
         .then((res) => {
@@ -642,8 +442,8 @@ export default {
                 item.stateFlag == 5
                   ? "未审核"
                   : item.stateFlag == 6
-                  ? "已审核"
-                  : "";
+                    ? "已审核"
+                    : "";
             });
           } else {
             this.$message.error(res.message);

src/views/entrustedManagement/components/cableNews/cableNews.vue

@@ -1,9 +1,16 @@
 <template>
-    <div class="examination">
-        <div class="common-head-search">
-            <el-form :inline="true">
-                <el-form-item label="接收日期">
-                    <el-date-picker
+  <div class="examination">
+    <div class="common-head-search">
+      <el-form :inline="true">
+        <el-form-item label="接收日期">
+          <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
                         v-model="search.times"
                         type="daterange"
                         range-separator="至"
@@ -14,121 +21,96 @@
                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                     >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item>
-                    <el-button
-                        icon="el-icon-search"
-                        type="goon"
-                        size="mini"
-                        @click="searchData"
-                        >查询</el-button
-                    >
-                    <el-button
-                        icon="el-icon-refresh"
-                        type="info"
-                        plain
-                        size="mini"
-                        @click="reset"
-                        >重置</el-button
-                    >
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-row>
-            <el-col :span="14">
-                <el-tabs v-model="activeName" type="border-card">
-                    <el-tab-pane label="接收电文" name="first">
-                        <div class="common-title-div" style="height: auto; margin-top: -10px;">
-                            <div class="common-title-name" style="width:281px">
-                                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
-                                接收电文信息
-                            </div>
-                        </div>
-                        <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-                            <el-table id="excelTable" 
-                                v-loading="dataLoading" ref="dataTable" 
-                                border 
-                                @row-click='saveDataMain' 
-                                :height="height_top" 
-                                highlight-current-row 
-                                :data="table1" 
-                                :icore-filter-flag="icoreFilterFlag"
-                                :cell-class-name="tableRowClassName"
-                                :header-cell-style="tableHeaderCellStyle" 
-                                width= '50%' 
-                                @selection-change="selectRow1" 
-                                :summary-method="getSummaries"
-                                show-summary>
-                                    <el-table-column type="index" label="NO" fixed="left" align="center" width="45"></el-table-column>
-                                    <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="30px" prop="validFlag1" label="状态" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="carNo" label="委托编号" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="registerName" label="注册系统名称" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="createDate" label="接收时间" align="center"></el-table-column>
-                            </el-table>
-                        </div>
-                        <div class="common-foot-style">
-                            <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
-                                :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-                                :total="page.totalPage" background>
-                            </el-pagination>
-                        </div>
-                    </el-tab-pane>
-                    <el-tab-pane label="发送电文" name="first1">
-                        <div class="common-title-div" style="height: auto; margin-top: -10px;">
-                            <div class="common-title-name" style="width:281px">
-                                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
-                                发送电文信息
-                            </div>
-                        </div>
-                        <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-                            <el-table id="excelTable2" 
-                                v-loading="dataLoading" ref="dataTable2" 
-                                border 
-                                @row-click='saveDataMain1' 
-                                :height="height_top" 
-                                highlight-current-row 
-                                :data="table2" 
-                                :icore-filter-flag="icoreFilterFlag"
-                                :cell-class-name="tableRowClassName"
-                                :header-cell-style="tableHeaderCellStyle" 
-                                width= '50%' 
-                                @selection-change="selectRow2" 
-                                :summary-method="getSummaries"
-                                show-summary>
-                                    <el-table-column type="index" label="NO" fixed="left" align="center" width="45"></el-table-column>
-                                    <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
-                                    <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="30px" prop="validFlag1" label="状态" align="center"></el-table-column> -->
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="sampleNo" label="样号" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
-                                    <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="createTime" label="创建时间" align="center"></el-table-column>
-                            </el-table>
-                        </div>
-                        <div class="common-foot-style">
-                            <el-pagination @size-change="pageSizeChange1" @current-change="pageCurrentChange1"
-                                :current-page="page1.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page1.pageSize" layout="total, sizes, prev, pager, next, jumper"
-                                :total="page1.totalPage" background>
-                            </el-pagination>
-                        </div>
-                    </el-tab-pane>
-                    
-                </el-tabs>
-            </el-col>
-            <el-col :span="10">
-                <div class="common-title-div"  style="height:65px; margin-top: 13px;">
-                    <div class="common-title-name">
-                        <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
-                        电文信息
-                    </div>
-                </div>
-                <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-                    <div><span>{{this.MessageContent}}</span></div>
-                </div>
-            </el-col>
-        </el-row>
+                    </el-date-picker> -->
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
+        </el-form-item>
+      </el-form>
     </div>
+    <el-row>
+      <el-col :span="14">
+        <el-tabs v-model="activeName" type="border-card">
+          <el-tab-pane label="接收电文" name="first">
+            <div class="common-title-div" style="height: auto; margin-top: -10px;">
+              <div class="common-title-name" style="width:281px">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                接收电文信息
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border @row-click='saveDataMain'
+                :height="height_top" highlight-current-row :data="table1" :icore-filter-flag="icoreFilterFlag"
+                :cell-class-name="tableRowClassName" :header-cell-style="tableHeaderCellStyle" width='50%'
+                @selection-change="selectRow1" :summary-method="getSummaries" show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center" width="45"></el-table-column>
+                <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="30px" prop="validFlag1" label="状态"
+                  align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="carNo" label="委托编号"
+                  align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="registerName"
+                  label="注册系统名称" align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称"
+                  align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="createDate" label="接收时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+            <div class="common-foot-style">
+              <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
+                :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+              </el-pagination>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="发送电文" name="first1">
+            <div class="common-title-div" style="height: auto; margin-top: -10px;">
+              <div class="common-title-name" style="width:281px">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                发送电文信息
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table id="excelTable2" v-loading="dataLoading" ref="dataTable2" border @row-click='saveDataMain1'
+                :height="height_top" highlight-current-row :data="table2" :icore-filter-flag="icoreFilterFlag"
+                :cell-class-name="tableRowClassName" :header-cell-style="tableHeaderCellStyle" width='50%'
+                @selection-change="selectRow2" :summary-method="getSummaries" show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center" width="45"></el-table-column>
+                <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="30px" prop="validFlag1" label="状态" align="center"></el-table-column> -->
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="50px" prop="sampleNo" label="样号"
+                  align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称"
+                  align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="createTime" label="创建时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+            <div class="common-foot-style">
+              <el-pagination @size-change="pageSizeChange1" @current-change="pageCurrentChange1"
+                :current-page="page1.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="page1.totalPage" background>
+              </el-pagination>
+            </div>
+          </el-tab-pane>
+
+        </el-tabs>
+      </el-col>
+      <el-col :span="10">
+        <div class="common-title-div" style="height:65px; margin-top: 13px;">
+          <div class="common-title-name">
+            <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+            电文信息
+          </div>
+        </div>
+        <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+          <div><span>{{ this.MessageContent }}</span></div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 <script>
 import {
@@ -142,213 +124,213 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-    data () {
-        return{
-            search:{
-                times: []
-            },
-            table1:[],
-            table2:[],
-            activeName:'first',
-            dataLoading: false,
-            selectRow1:[],
-            selectRow2:[],
-            height_top: 0,
-            icoreFilterFlag: true,
-            clickRow1:{},
-            page: {
-                pageSize: 100,
-                pageNum: 1,
-                totalPage: 0
-            },
-            page1: {
-                pageSize: 100,
-                pageNum: 1,
-                totalPage: 0
-            },
+  data() {
+    return {
+      search: {
+        times: []
+      },
+      table1: [],
+      table2: [],
+      activeName: 'first',
+      dataLoading: false,
+      selectRow1: [],
+      selectRow2: [],
+      height_top: 0,
+      icoreFilterFlag: true,
+      clickRow1: {},
+      page: {
+        pageSize: 100,
+        pageNum: 1,
+        totalPage: 0
+      },
+      page1: {
+        pageSize: 100,
+        pageNum: 1,
+        totalPage: 0
+      },
 
-            dataLoading2: false,
-            MessageContent: '',
-        }
+      dataLoading2: false,
+      MessageContent: '',
+    }
+  },
+  created() {
+    this.height_top = window.innerHeight - 190;
+    this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
+  },
+  mounted() {
+    this.searchData()
+  },
+  methods: {
+    getYNM(date) {
+      let year = date.getFullYear().toString();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      month = month < 10 ? "0" + month : month;
+      day = day < 10 ? "0" + day : day;
+      return `${year}-${month}-${day}`;
     },
-    created(){
-        this.height_top =  window.innerHeight - 190;
-        this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
+    searchData() {
+      this.mainData()
+      this.mainData2()
     },
-    mounted(){
-        this.searchData()
+    mainData() {
+      let startTime = ''
+      let endTime = ''
+      if (!this.search.times) {
+        startTime = ''
+        endTime = ''
+      } else {
+        startTime = this.search.times[0] + ' 00:00:00'
+        endTime = this.search.times[1] + ' 23:59:59'
+      }
+      let obj = {
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize,
+        startTime: startTime,
+        endTime: endTime
+      }
+      this.dataLoading = true;
+      this.axios.post('pass/baseManagement/v1/iotmsghandles/queryList', obj, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.table1 = res.data.list
+          this.page.totalPage = res.data.total
+          this.table1.forEach(str => {
+            str.validFlag1 = str.validFlag == '1' ? '已接收' : str.validFlag === '2' ? '已生成' : ''
+          })
+          this.dataLoading = false;
+        } else {
+          this.dataLoading = false;
+          this.$message.error(res.message);
+        }
+      }).catch(e => {
+        this.dataLoading = false;
+        this.$message.error(res.message);
+      });
     },
-    methods:{
-        getYNM (date) {
-            let year = date.getFullYear().toString();
-            let month = date.getMonth() + 1;
-            let day = date.getDate();
-            month = month < 10 ? "0" + month : month;
-            day = day < 10 ? "0" + day : day;
-            return `${year}-${month}-${day}`;
-        },
-        searchData() {
-            this.mainData()
-            this.mainData2()
-        },
-        mainData() {
-            let startTime = ''
-            let endTime = ''
-            if (!this.search.times) {
-                startTime = ''
-                endTime = ''
-            }else{
-                startTime = this.search.times[0] + ' 00:00:00'
-                endTime = this.search.times[1]  + ' 23:59:59'
-            }
-            let obj = {
-                pageIndex: this.page.pageNum,
-                pageSize: this.page.pageSize,
-                startTime: startTime,
-                endTime: endTime
-            }
-            this.dataLoading = true;
-            this.axios.post('pass/baseManagement/v1/iotmsghandles/queryList', obj, { individualType: 'json' }).then(res => {
-                if(res.code == 0 || res.code == 200){
-                    this.table1 = res.data.list
-                    this.page.totalPage = res.data.total
-                    this.table1.forEach(str=>{
-                        str.validFlag1 = str.validFlag == '1' ? '已接收' : str.validFlag === '2' ? '已生成' : ''
-                    })
-                    this.dataLoading = false;
-                }else{
-                    this.dataLoading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch(e => {
-                this.dataLoading = false;
-                this.$message.error(res.message);
-            });
-        },
-        mainData2() {
-            let startTime = ''
-            let endTime = ''
-            if (!this.search.times) {
-                startTime = ''
-                endTime = ''
-            }else{
-                startTime = this.search.times[0] + ' 00:00:00'
-                endTime = this.search.times[1]  + ' 23:59:59'
-            }
-            let obj = {
-                object:{
-                    validFlag: '1',
-                    matName:'',
-                },
-                pageIndex: this.page1.pageNum,
-                pageSize: this.page1.pageSize,
-                list:[6],
-                startTime: startTime,
-                endTime: endTime
-            }
-            this.dataLoading = true;
-            this.axios.post('pass/testManagement/v1/limssamplereleases/queryLimsSampleReleasePage3', obj, { individualType: 'json' }).then(res => {
-                if(res.code == 0 || res.code == 200){
-                    this.table2 = res.data.list
-                    this.page1.totalPage = res.data.total
-                    // this.table2.forEach(str=>{
-                    //     str.validFlag1 = str.stateFlag == '5' ? '未发送' : str.stateFlag === '6' ? '已发送' : ''
-                    // })
-                    this.dataLoading = false;
-                }else{
-                    this.dataLoading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch(e => {
-                this.dataLoading = false;
-                this.$message.error(res.message);
-            });
-        },
-        saveDataMain(row) {
-            this.clickRow1 = row;
-            this.mainData3();
-        },
-        saveDataMain1(row) {
-            this.MessageContent = row.msgSource;
-        },
-        mainData3(){
-            if(this.clickRow1 == {}){
-                this.$message.warning('未点击电文主信息！')
-            }
-            this.dataLoading2 = true;
-            this.axios.post('pass/baseManagement/v1/iotmsgsources/queryByMsgId', {msgId: this.clickRow1.msgId}, { individualType: 'json' }).then(res => {
-                if(res.code == 0 || res.code == 200){
-                    this.MessageContent = res.data[0].msgSource
-                    this.dataLoading2 = false;
-                }else{
-                    this.dataLoading2 = false;
-                    this.$message.error(res.message);
-                }
-            }).catch(e => {
-                this.dataLoading2 = false;
-                this.$message.error(res.message);
-            });
-        },
-        reset() {
-            this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
-        },
-        pageSizeChange (size) {
-            this.page.pageSize = size;
-            this.mainData();
-            this.mainData1();
-        },
-        pageCurrentChange (index) {
-            this.page.pageNum = index;
-            this.mainData();
-            this.mainData1();
-        },
-        pageSizeChange1 (size) {
-            this.page1.pageSize = size;
-            this.mainData();
-            this.mainData1();
+    mainData2() {
+      let startTime = ''
+      let endTime = ''
+      if (!this.search.times) {
+        startTime = ''
+        endTime = ''
+      } else {
+        startTime = this.search.times[0] + ' 00:00:00'
+        endTime = this.search.times[1] + ' 23:59:59'
+      }
+      let obj = {
+        object: {
+          validFlag: '1',
+          matName: '',
         },
-        pageCurrentChange1 (index) {
-            this.page1.pageNum = index;
-            this.mainData();
-            this.mainData1();
-        },
-        getSummaries(param) {
-            const { columns, data } = param;
-            const sums = [];
-            columns.forEach((column, index) => {
-                if (index === 0) {
-                sums[index] = "合计";
-                }
-                if (index === 1) {
-                sums[index] = data.length;
-                }
-                if (column.property === "netWgt") {
-                let val = 0;
-                for (let i in data) {
-                    val = this.floatComputed(
-                    data[i].netWgt ? data[i].netWgt : 0,
-                    val,
-                    "+"
-                    );
-                }
-                sums[index] = val;
-                }
-            });
-            return sums;
-        },
-        tableRowClassName ({
-                row, column, rowIndex, columnIndex
-            }) {
-                if (columnIndex === 2) {
-                    if (row.validFlag === '2') {
-                        return 'error-green';
-                    }
-                return '';
-                }
-        },
-        tableHeaderCellStyle () {
-            return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
+        pageIndex: this.page1.pageNum,
+        pageSize: this.page1.pageSize,
+        list: [6],
+        startTime: startTime,
+        endTime: endTime
+      }
+      this.dataLoading = true;
+      this.axios.post('pass/testManagement/v1/limssamplereleases/queryLimsSampleReleasePage3', obj, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.table2 = res.data.list
+          this.page1.totalPage = res.data.total
+          // this.table2.forEach(str=>{
+          //     str.validFlag1 = str.stateFlag == '5' ? '未发送' : str.stateFlag === '6' ? '已发送' : ''
+          // })
+          this.dataLoading = false;
+        } else {
+          this.dataLoading = false;
+          this.$message.error(res.message);
+        }
+      }).catch(e => {
+        this.dataLoading = false;
+        this.$message.error(res.message);
+      });
+    },
+    saveDataMain(row) {
+      this.clickRow1 = row;
+      this.mainData3();
+    },
+    saveDataMain1(row) {
+      this.MessageContent = row.msgSource;
+    },
+    mainData3() {
+      if (this.clickRow1 == {}) {
+        this.$message.warning('未点击电文主信息！')
+      }
+      this.dataLoading2 = true;
+      this.axios.post('pass/baseManagement/v1/iotmsgsources/queryByMsgId', { msgId: this.clickRow1.msgId }, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.MessageContent = res.data[0].msgSource
+          this.dataLoading2 = false;
+        } else {
+          this.dataLoading2 = false;
+          this.$message.error(res.message);
         }
+      }).catch(e => {
+        this.dataLoading2 = false;
+        this.$message.error(res.message);
+      });
+    },
+    reset() {
+      this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
+    },
+    pageSizeChange(size) {
+      this.page.pageSize = size;
+      this.mainData();
+      this.mainData1();
+    },
+    pageCurrentChange(index) {
+      this.page.pageNum = index;
+      this.mainData();
+      this.mainData1();
+    },
+    pageSizeChange1(size) {
+      this.page1.pageSize = size;
+      this.mainData();
+      this.mainData1();
+    },
+    pageCurrentChange1(index) {
+      this.page1.pageNum = index;
+      this.mainData();
+      this.mainData1();
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 1) {
+          sums[index] = data.length;
+        }
+        if (column.property === "netWgt") {
+          let val = 0;
+          for (let i in data) {
+            val = this.floatComputed(
+              data[i].netWgt ? data[i].netWgt : 0,
+              val,
+              "+"
+            );
+          }
+          sums[index] = val;
+        }
+      });
+      return sums;
+    },
+    tableRowClassName({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 2) {
+        if (row.validFlag === '2') {
+          return 'error-green';
+        }
+        return '';
+      }
+    },
+    tableHeaderCellStyle() {
+      return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
+  }
 }
-</script>
+</script>

src/views/entrustedManagement/components/inspectionMaterials/inspectionMaterialsGit.vue

@@ -0,0 +1,1230 @@
+<!-- 检验委托-原料 -->
+<template>
+  <div class="examination">
+    <div class="common-head-search">
+      <el-form :inline="true">
+        <el-form-item label="检验类型">
+          <el-select v-model="search.testTypeCode" clearable filterable collapse-tags size="small" style="width: 100px"
+            placeholder="请选择查询内容">
+            <el-option v-for="item in sampleTypeNameType" :key="item.baseName" :label="item.baseName"
+              :value="item.baseCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='计划单位'>
+          <el-select v-model="search.planCompanyNo" clearable filterable collapse-tags size="small"
+            style="width:120px;margin-right: 10px;" placeholder="请选择查询内容">
+            <el-option v-for="item in entrOrgNameType" :key="item.baseName" :label="item.orgName" :value="item.orgCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='物料名称'>
+          <el-input v-model="search.matName" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 120px;margin-right: 10px;"></el-input>
+        </el-form-item>
+        <el-form-item label='供应商'>
+          <el-input v-model="search.suppName" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 120px;margin-right: 10px;"></el-input>
+        </el-form-item>
+        <el-form-item label='委托样号'>
+          <el-input v-model="search.carNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 120px;margin-right: 10px;"></el-input>
+        </el-form-item>
+        <el-form-item label='合同号'>
+          <el-input v-model="search.contractNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 120px;margin-right: 10px;"></el-input>
+        </el-form-item>
+        <el-form-item label='预报号'>
+          <el-input v-model="search.planNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 120px;margin-right: 10px;"></el-input>
+        </el-form-item>
+        <el-form-item label="委托日期">
+          <el-date-picker v-model="search.entrTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" size="small" style="width:270px" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
+        </el-form-item>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <el-input v-model="values" ref="autoInput" size="mini" style="display: inline-block; width: 150px"
+          @input="autoSubmit()" placeholder="扫码接收" clearable :disabled="inputLoading"></el-input>
+      </el-form>
+    </div>
+    <el-row>
+      <el-col :span="14">
+        <el-tabs v-model="activeName" type="border-card" class="testManagement_left">
+          <el-tab-pane label="有效委托" name="first">
+            <div class="common-title-div" style="height: auto; margin-top: -10px;">
+              <div class="common-title-name" style="width:281px">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                检验委托信息
+              </div>
+              <div>
+                <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini"
+                  v-privilege="activeMenu + 'tempAdd'" @click="addData">新增临时委托</el-button>
+                <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" v-privilege="activeMenu + 'ADD'"
+                  @click="addOneData">新增</el-button>
+                <el-button icon="el-icon-edit" type="goon" size="mini" v-privilege="activeMenu + 'PUT'"
+                  @click="modifyData">修改</el-button>
+                <el-button icon="el-icon-check" type="goon" size="mini" :loading="subLoading8"
+                  @click="updateSampleNo">修改委托编号</el-button>
+                <el-button icon="el-icon-check" type="goon" size="mini" :loading='subLoading' style="border:3px;"
+                  v-privilege="activeMenu + 'submit'" @click="submitData">提交</el-button>
+                <el-button icon="el-icon-back" type="danger" size="mini" :loading='subLoading' style="border:3px;"
+                  v-privilege="activeMenu + 'submit'" @click="cancelData">取消提交</el-button>
+                <el-button icon="el-icon-back" type="danger" size="mini" :loading='subLoading' style="border:3px;"
+                  v-privilege="activeMenu + 'submit'" @click="disable">停用</el-button>
+                <el-button icon="el-icon-printer" type="goon" size="mini" :loading="printLoading"
+                  @click="printQRCode">打印标签</el-button>
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border @row-click='saveDataMain'
+                :height="height_top" highlight-current-row :data="table.list" :icore-filter-flag="icoreFilterFlag"
+                :header-cell-style="tableHeaderCellStyle" width='50%' @cell-click='searchFollow'
+                @selection-change="selectRow" :cell-class-name="tableRowClassName" :summary-method="getSummaries"
+                show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center" width="35"></el-table-column>
+                <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="60px" prop="stateFlag1" label="状态"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="carNo" label="委托编号"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.carNo" :id="scope.column.id + '--' + scope.$index"
+                      @keydown.native="keyDown($event, scope.row, scope.$index)" size="small" style="width: 100%">
+                    </el-input>
+
+                  </template>
+                </el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleNo" label="中心编号"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="125px" prop="matName" label="物料"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="145px" prop="entrTime1" label="委托日期"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="memo" label="备注"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.memo" :id="scope.column.id + '--' + scope.$index"
+                      @keydown.native="keyDown($event, scope.row, scope.$index)" size="small" style="width: 100%">
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="trainNo" label="火车号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName"
+                  label="取样频次" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="heatNo" label="炉号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型" align="center"></el-table-column> -->
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName"
+                  label="计划单位" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName"
+                  label="检验单位" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName"
+                  label="检验班组" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"  align="center"></el-table-column> -->
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName"
+                  label="样品类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName"
+                  label="委托类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName"
+                  label="检验类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName"
+                  label="物料分类" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName"
+                  label="试样形状" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="trainNo" label="火车号"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"  align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="到货批次"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"  align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+            <div class="common-foot-style">
+              <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
+                :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+              </el-pagination>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="停用委托" name="first1">
+            <div class="common-title-div" style="height: auto">
+              <div class="common-title-name" style="width:150px">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                停用委托信息
+              </div>
+              <div>
+                <el-button icon="el-icon-check" type="goon" size="mini" :loading='subLoadingq' style="border:3px;"
+                  v-privilege="activeMenu + 'submit'" @click="removeNumber">清除编号</el-button>
+                <el-button icon="el-icon-check" type="goon" size="mini" :loading='subLoadingq' style="border:3px;"
+                  v-privilege="activeMenu + 'submit'" @click="enable">启用</el-button>
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border @row-click='saveDataMain'
+                :height="height_top" highlight-current-row :data="table.list1" :icore-filter-flag="icoreFilterFlag"
+                :header-cell-style="tableHeaderCellStyle" width='50%' @cell-click='searchFollow'
+                @selection-change="selectRow1" :cell-class-name="tableRowClassName" :summary-method="getSummaries"
+                show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center" width="35"></el-table-column>
+                <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="60px" prop="stateFlag1" label="状态"
+                  align="center"></el-table-column>
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托编号" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="carNo" label="委托编号"
+                  align="center">
+                  <template slot-scope="{ row }">
+                    <el-input v-model="row.carNo" size="small" style="width: 100%">
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleNo" label="中心编号"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="125px" prop="matName" label="物料"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="145px" prop="entrTime1" label="委托日期"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="trainNo" label="火车号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName"
+                  label="取样频次" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="heatNo" label="炉号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型" align="center"></el-table-column> -->
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号" align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName"
+                  label="计划单位" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName"
+                  label="检验单位" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName"
+                  label="检验班组" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"  align="center"></el-table-column> -->
+                <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组" align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName"
+                  label="样品类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName"
+                  label="委托类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName"
+                  label="检验类型" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName"
+                  label="物料分类" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName"
+                  label="试样形状" align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="trainNo" label="火车号"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"  align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"
+                  align="center"></el-table-column>
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="到货批次"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"  align="center"></el-table-column> -->
+                <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"  align="center"></el-table-column> -->
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+            <div class="common-foot-style">
+              <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
+                :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+              </el-pagination>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+      <el-col :span="10">
+        <el-tabs v-model="activeName2" type="border-card" class="testManagement_left">
+          <el-tab-pane label="检验项目" name="first">
+            <div class="common-title-div" style="height:75px; margin-top: 25px;">
+              <div class="common-title-name">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                计划检验项目表
+              </div>
+              <div>
+                <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini"
+                  v-privilege="activeMenu + 'addDep'" @click="addData2">新增</el-button>
+                <el-button icon="el-icon-remove-outline" type="danger" size="mini"
+                  v-privilege="activeMenu + 'deleteDep'" @click="deleteData2">删除</el-button>
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" @row-click='saveData'
+                highlight-current-row :data="table.list2" :icore-filter-flag="icoreFilterFlag"
+                :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName2"
+                :summary-method="getSummaries" show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="90px" prop="anlyItemNo"
+                  label="分析项目编号" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="anlyItemName"
+                  label="分析项目" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="minSign" label="下限符"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="90px" prop="minValue" label="最小值"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="maxSign" label="上限符"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="90px" prop="maxValue" label="最大值"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="memo" label="备注"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="createMan" label="创建人"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="接收电文" name="second">
+            <div class="common-title-div" style="height:75px; margin-top: 25px;">
+              <div class="common-title-name">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                接收电文
+              </div>
+              <div>
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table v-loading="dataLoading3" ref="dataTable3" border :height="height_bot" highlight-current-row
+                :data="table.list3" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+                :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="400px" prop="msgSource" label="电文内容"
+                  align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="createDate" label="创建时间"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="发送电文" name="three">
+            <div class="common-title-div" style="height:75px; margin-top: 25px;">
+              <div class="common-title-name">
+                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+                发送电文
+              </div>
+              <div>
+              </div>
+            </div>
+            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+              <el-table v-loading="dataLoading4" ref="dataTable2" border :height="height_bot" highlight-current-row
+                :data="table.list4" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+                :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
+                <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" min-width="600px" prop="msgSource" label="电文内容"
+                  align="center"></el-table-column>
+              </el-table>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+    </el-row>
+    <div id="printContainer2" style="margin-left: 25px; margin-top: 3px" v-show="false">
+      <div id="printContent">
+        <div v-for="(item, index) in printData" :key="item.id"
+          style="height: 200px; width: 439px;border: 1px solid #fff; position: relative">
+          <!-- <div style="text-align: center; margin-top: 5px;">
+              <strong style="font-size: 13px">样品标示卡（BBWXCLJC-4-16-02）</strong><br />
+            </div> -->
+          <div>
+            <div style="font-size: 15px; line-height: 18px; margin-left: 25px;; margin-top: 10px">
+              产品名称：{{ item.matName }}
+            </div>
+            <div style="font-size: 15px; line-height: 18px; margin-left: 25px;">
+              委托编号：{{ item.carNo }}
+            </div>
+            <div style="font-size: 15px; line-height: 18px; margin-left: 25px;">
+              中心编号：{{ item.sampleNo }}
+            </div>
+            <div style="font-size: 15px; line-height: 18px; margin-left: 25px">
+              接样日期：{{ item.entrTime }}
+              &nbsp;&nbsp;&nbsp;&nbsp;保存周期：{{ item.matEngAbbr }}天
+            </div>
+            <div v-if="item.anlyName.length > 80" style="
+                  margin-left: 25px;
+                  word-wrap: break-word;
+                  word-break: normal;
+                  font-size: 15px;
+                  line-height: 18px;
+                ">
+              <span style="font-size: 13px">检验项目：</span>{{ item.anlyName }}
+            </div>
+            <div v-else style="
+                  margin-left: 25px;
+                  word-wrap: break-word;
+                  word-break: normal;
+                  font-size: 15px;
+                  line-height: 18px;
+                " :id="'anlyName' + index">
+              <span style="font-size: 13px">检验项目：{{ item.anlyName ? item.anlyName : '' }}</span>
+            </div>
+            <div style="text-align: center; margin-bottom: 0px;">
+              <img width="83%" :id="`barcode${item.id}`" />
+            </div>
+            <div v-if="printData.length > 1" style="page-break-after: always"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div is="alertComponets" :showFlag="showFlag" :Params="Params" @refresh='refresh'></div>
+    <div is="alertComponets3" :showFlag3="showFlag3" :Params="Params" @refresh='refresh'></div>
+    <div is="alertComponets2" :showFlag2="showFlag2" :Params="Params" :Params2="Params2" @refresh='refresh2'></div>
+  </div>
+</template>
+<script>
+import {
+  getCookie,
+  formatDate
+} from '@/utils/util.js';
+import {
+  cookieUserId,
+  cookieUserName
+} from '@/config/config.js'
+import alertComponets from './alertComponents';
+import alertComponets2 from './alertComponents2';
+import alertComponets3 from './alertComponents3';
+import JsBarcode from 'jsbarcode'
+let userName = getCookie(cookieUserName);
+let userId = getCookie(cookieUserId);
+export default {
+  components: { alertComponets, alertComponets2, alertComponets3 },
+  data() {
+    return {
+      table: {
+        list: [],
+        list1: [],
+        list2: [],
+        list3: [],
+        list4: []
+      },
+      values: '',
+      timeId: null,
+      activeName: 'first',
+      activeName2: 'first',
+      saveRow: {},
+      selectRows: [],
+      selectRow1s: [],
+      dataLoading: false,
+      dataLoading2: false,
+      dataLoading3: false,
+      dataLoading4: false,
+      inputLoading: false,
+      subLoading: false,
+      subLoadingq: false,
+      icoreFilterFlag: true,
+      showFlag3: false,
+      printLoading: false,
+      page: {
+        pageSize: 200,
+        pageNum: 1,
+        totalPage: 0
+      },
+      page2: {
+        pageSize: 200,
+        pageNum: 1,
+        totalPage: 0
+      },
+      savaDep: {},
+      list: [],
+      entrId: '',
+      showFlag: false,
+      Params: {},
+      showFlag2: false,
+      Params2: {},
+      entrOrgNameType: [],
+      entrOrgNameType1: [],
+      sampleTypeNameType: [],
+      multipleSelection3: [],
+      multipleSelection4: [],
+      search: {
+        entrTime: [],
+        testTypeCode: '',
+        planCompanyName: '',
+        matName: '',
+        suppName: '',
+        carNo: '',
+        contractNo: '',
+        planNo: ''
+      },
+      height_top: 0,
+      height_bot: 0,
+      activeMenu: '',
+      cancelEntrustLoading: false,
+      printData: [],
+      subLoading8: false,
+      editRow: {}
+    }
+  },
+  created() {
+    this.height_top = window.innerHeight - 190;
+    this.height_bot = window.innerHeight - 190;
+    this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
+    this.activeMenu = window.top.localStorage.getItem('activeMenu')
+  },
+  mounted() {
+    this.axios
+      .post(
+        "pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode",
+        { validFlag: 1, baseCode: 4803 },
+        { individualType: "json" }
+      )
+      .then((res) => {
+        this.sampleTypeNameType = res.data;
+      });
+    this.search.testTypeCode = '480301';
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: 'json' }).then(response => {
+      this.entrOrgNameType = response.data
+    });
+    this.searchData();
+    this.addScreen();
+    this.addScreen2()
+  },
+  methods: {
+    getYNM(date) {
+      let year = date.getFullYear().toString();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      month = month < 10 ? "0" + month : month;
+      day = day < 10 ? "0" + day : day;
+      return `${year}-${month}-${day}`;
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 1) {
+          sums[index] = data.length;
+        }
+        if (column.property === "netWgt") {
+          let val = 0;
+          for (let i in data) {
+            val = this.floatComputed(
+              data[i].netWgt ? data[i].netWgt : 0,
+              val,
+              "+"
+            );
+          }
+          sums[index] = val;
+        }
+      });
+      return sums;
+    },
+    keyDown(event, row, rindex) {
+      let tdTarget = event.target;
+      let pid = tdTarget.id;
+      if (!pid) {
+        return true;
+      }
+      let ids = pid.split("--");
+      if (ids.length != 2) {
+        return true;
+      }
+      let columnId = ids[0];
+      let index = ids[1];
+      let that = this;
+      while (tdTarget.tagName !== 'TD') {
+        tdTarget = tdTarget.parentElement;
+      }
+      // 如果按下键盘下键或者回车键
+      if (event.keyCode === 40 || event.keyCode === 13) {
+        let ind = Number(rindex) + 1;
+        let id = '#' + columnId + '--' + ind;
+        let input = $(id);
+        if (input) {
+          this.$refs.dataTable.setCurrentRow(this.table.list[ind]);
+          input.focus();
+          input.blur();
+          input.select(); // 选中内容
+          event.stopPropagation();
+          event.stopImmediatePropagation();
+          event.preventDefault();
+          return false;
+        }
+      } else if (event.keyCode === 38) { // 键盘上键
+        let ind = Number(index) - 1;
+        let id = '#' + columnId + '--' + ind;
+        let input = $(id);
+        if (input) {
+          this.$refs.dataTable.setCurrentRow(this.table.list[ind]);
+          input.focus();
+          input.select(); // 选中内容
+          event.stopPropagation();
+          event.stopImmediatePropagation();
+          event.preventDefault();
+          return false;
+        }
+      }
+    },
+    refresh(arg) {
+      if (arg !== 2) {
+        arg = 1
+      }
+      this.setFlag();
+      if (arg === 1) {
+        this.mainData();
+        this.mainData1();
+      }
+    },
+    refresh1() {
+      this.setFlag();
+    },
+    refresh2() {
+      this.depData(this.entrId);
+    },
+    addData() {
+      this.showFlag = !this.showFlag;
+      this.Params = null;
+    },
+    addOneData() {
+      this.showFlag3 = !this.showFlag3;
+      this.Params = null;
+    },
+    saveDataMain(row) {
+      this.saveRow = Object.assign({}, row)
+      this.editRow = row
+    },
+    modifyData() {
+      if (JSON.stringify(this.saveRow) === "{}") {
+        this.$message.warning('请点击选中一条您要修改的数据')
+        return
+      }
+      if (this.saveRow.stateFlag == 1) {
+        this.$message.warning('数据已提交，不可进行修改')
+        return
+      }
+      this.Params = this.saveRow
+      this.showFlag = !this.showFlag;
+    },
+    removeNumber() {
+      this.subLoadingq = true;
+      this.axios.post("pass/testManagement/v1/api/reflection/removeMapPkALL").then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.subLoadingq = false
+          this.$message.success(res.message);
+        } else {
+          this.subLoadingq = false
+          this.$message.error(res.message)
+        }
+      })
+    },
+    autoSubmit() {
+      if (!this.values) {
+        this.$message.warning('请先用扫码枪扫描标签')
+        return
+      }
+      if (!this.timeId) {
+        this.timeId = setTimeout(() => {
+          this.inputLoading = true
+          this.axios.post('pass/testManagement/v1/limstestentrusts/scanningSubmit', { carNo: this.values }, { individualType: 'json' }).then(res => {
+            if (res.code == 0 || res.code == 200) {
+              this.$nextTick(() => {
+                this.$refs.autoInput.focus()
+              })
+              this.values = ''
+              this.inputLoading = false
+              this.$message.success("操作成功！");
+              this.mainData()
+            } else {
+              this.$nextTick(() => {
+                this.$refs.autoInput.focus()
+              })
+              this.values = ''
+              this.inputLoading = false
+              this.$message.error(res.message)
+            }
+          }).catch(e => {
+            this.$nextTick(() => {
+              this.$refs.autoInput.focus()
+            })
+            this.values = ''
+            this.inputLoading = false
+            this.$message.error(e.message)
+          })
+          this.timeId = null;
+        }, 1000);
+      }
+    },
+    //检验委托信息提交
+    async submitData() {
+      if (this.selectRows.length == 0) {
+        return this.$message.warning('请至少勾选一条数据进行提交!');
+      }
+      let ids = []
+      for (let i = 0; i < this.selectRows.length; i++) {
+        let item = this.selectRows[i];
+        if (item.stateFlag === '1') {
+          return this.$message.warning('委托编号为[' + item.id + ']的数据已经提交，无法再次进行提交!');
+        }
+        if (item.validFlag === '1') {
+          ids.push(item.id)
+        }
+      }
+      this.subLoading = true
+      for (let i = 0; i < this.selectRows.length; i++) {
+        let item = this.selectRows[i];
+        const str = await this.axios.post("pass/testManagement/v1/limstestentrusts/saveLimsTestEntrust", item, { individualType: "json", });
+        if (str.succeed) {
+          const str1 = await this.axios.post('pass/testManagement/v1/limstestentrusts/submit', [item.entrId], { individualType: 'json' });
+          if (str1.code == 0 || str1.code == 200) {
+            this.$message.success(str1.message);
+          } else {
+            this.$message.warning(str1.message)
+          }
+        } else {
+          this.$message.error(str.message)
+        }
+      }
+      this.subLoading = false;
+      this.mainData();
+      this.mainData1();
+    },
+    saveData(row) {
+      this.savaDep = Object.assign({}, row)
+    },
+    addData2() {
+      if (JSON.stringify(this.saveRow) === "{}") {
+        this.$message.warning('请点击选中一条检验委托信息数据')
+        return
+      }
+      if (this.saveRow.stateFlag == 1) {
+        this.$message.warning('数据已提交，不可进行新增')
+        return
+      }
+      this.showFlag2 = !this.showFlag2;
+      this.Params2 = null;
+      this.Params = this.saveRow
+    },
+    deleteData2() {
+      if (JSON.stringify(this.savaDep) === "{}") {
+        this.$message.warning('请点击选中一条检验委托信息数据')
+        return
+      }
+      if (this.saveRow.stateFlag == 1) {
+        this.$message.warning('数据已提交，不可进行删除')
+        return
+      }
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.axios.post('pass/testManagement/v1/limstestentrustds/deleteLimsTestEntrustD?id=' + this.savaDep.id, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.dialogTableVisible = false;
+            this.$message.success('删除成功');
+            this.depData(this.entrId)
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch(e => {
+          this.$message.error(e.message)
+        })
+      }).catch(() => { });
+    },
+    searchData() {
+      this.page.pageNum = 1;
+      this.page.pageSize = 200
+      this.mainData()
+      this.mainData1()
+    },
+    // 取消待取样
+    cancelEntrustData() {
+      if (JSON.stringify(this.saveRow) === "{}") {
+        this.$message.warning('请点击选中一条您要取消提交的数据')
+        return
+      }
+      this.cancelEntrustLoading = true
+      this.axios.post('pass/testManagement/v1/pretrackscales/doUpdateLimsFlag', [this.saveRow.planNo], { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.$message.success(res.message);
+          this.mainData()
+        } else {
+          this.$message.error(res.message)
+        }
+        this.cancelEntrustLoading = false
+      }).catch(e => {
+        this.cancelEntrustLoading = false
+        this.$message.error(e.message)
+      })
+    },
+    updateSampleNo() {
+      if (this.selectRows.length == 0) {
+        return this.$message.warning('请至少勾选一条您要修改的数据!');
+      }
+      this.subLoading8 = true
+      this.axios.post("pass/testManagement/v1/limstestentrusts/saveLimsTestEntrustList", this.selectRows, { individualType: "json", }).then((res) => {
+        if (res.succeed) {
+          this.subLoading8 = false
+          this.$message.success("修改成功");
+          this.searchData()
+        } else {
+          this.subLoading8 = false
+          this.$message.error(res.message);
+        }
+      }).catch((e) => {
+        this.subLoading8 = false
+        this.$message.error(e.message);
+      });
+    },
+    mainData() {
+      this.saveRow = {}
+      this.dataLoading = true;
+      if (!this.search.entrTime) {
+        this.startTime = ''
+        this.endTime = ''
+      } else {
+        this.startTime = this.search.entrTime[0] + ' 00:00:00'
+        this.endTime = this.search.entrTime[1] + ' 23:59:59'
+      }
+      let obj = {
+        object: {
+          entrOrgNo: this.search.planCompanyNo, // 委托单位
+          sampleTypeCode: 480101,
+          matName: this.search.matName,
+          suppName: this.search.suppName,
+          carNo: this.search.carNo,
+          contractNo: this.search.contractNo,
+          planNo: this.search.planNo,
+          validFlag: '1',
+        },
+        list: [this.search.testTypeCode],
+        'startTime': this.startTime,
+        'endTime': this.endTime,
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize
+      }
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage', obj, { individualType: 'json' }).then(res => {
+        this.table.list = res.data.list;
+        this.table.list.forEach(item => {
+          item.stateFlag1 = item.validFlag == '0' ? '已停用' : item.stateFlag === '0' ? '编辑' : item.stateFlag === '1' ? '提交' : ''
+          item.isCiq1 = item.isCiq === '0' ? '否' : item.isCiq === '1' ? '是' : ''
+          item.isBatch1 = item.isBatch === '0' ? '否' : item.isBatch === '1' ? '是' : ''
+          item.isSmp1 = item.isSmp === '0' ? '否' : item.isSmp === '1' ? '是' : ''
+          item.isPrep1 = item.isPrep === '0' ? '否' : item.isPrep === '1' ? '是' : ''
+          item.isCheck1 = item.isCheck === '0' ? '否' : item.isCheck === '1' ? '是' : ''
+          item.isMater1 = item.isMater === '0' ? '否' : item.isMater === '1' ? '是' : ''
+          item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd' + ' ' + 'HH:mm:ss')
+        })
+        this.dataLoading = false;
+        if (this.table.list.length > 0) {
+          this.$refs.dataTable.setCurrentRow(this.table.list[0])
+          this.searchFollow(this.table.list[0])
+        }
+        this.page.totalPage = res.data.total;
+      }).catch(e => {
+        this.dataLoading = false;
+      });
+    },
+    mainData1() {
+      this.saveRow = {}
+      this.dataLoading = true;
+      if (!this.search.entrTime) {
+        this.startTime = ''
+        this.endTime = ''
+      } else {
+        this.startTime = this.search.entrTime[0] + ' 00:00:00'
+        this.endTime = this.search.entrTime[1] + ' 23:59:59'
+      }
+      let obj = {
+        object: {
+          entrOrgNo: this.search.planCompanyNo, // 委托单位
+          sampleTypeCode: 480101,
+          matName: this.search.matName,
+          suppName: this.search.suppName,
+          carNo: this.search.carNo,
+          contractNo: this.search.contractNo,
+          planNo: this.search.planNo,
+          validFlag: '0',
+        },
+        list: [this.search.testTypeCode],
+        'startTime': this.startTime,
+        'endTime': this.endTime,
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize
+      }
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage', obj, { individualType: 'json' }).then(res => {
+        this.table.list1 = res.data.list;
+        this.table.list1.forEach(item => {
+          item.stateFlag1 = item.validFlag == '0' ? '已停用' : item.stateFlag === '0' ? '编辑' : item.stateFlag === '1' ? '提交' : ''
+          item.isCiq1 = item.isCiq === '0' ? '否' : item.isCiq === '1' ? '是' : ''
+          item.isBatch1 = item.isBatch === '0' ? '否' : item.isBatch === '1' ? '是' : ''
+          item.isSmp1 = item.isSmp === '0' ? '否' : item.isSmp === '1' ? '是' : ''
+          item.isPrep1 = item.isPrep === '0' ? '否' : item.isPrep === '1' ? '是' : ''
+          item.isCheck1 = item.isCheck === '0' ? '否' : item.isCheck === '1' ? '是' : ''
+          item.isMater1 = item.isMater === '0' ? '否' : item.isMater === '1' ? '是' : ''
+          item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd' + ' ' + 'HH:mm:ss')
+        })
+        this.dataLoading = false;
+        this.page.totalPage = res.data.total;
+      }).catch(e => {
+        this.dataLoading = false;
+      });
+    },
+    enable() {//启用
+      if (this.selectRow1s.length == 0) {
+        return this.$message.warning('请至少勾选一条您要启用的数据!');
+      }
+      // if (this.saveRow.validFlag != 0) {
+      //   this.$message.warning('数据未停用，不可启用！')
+      //   return
+      // }
+      let ids = []
+      for (let i = 0; i < this.selectRow1s.length; i++) {
+        let item = this.selectRow1s[i];
+        if (item.validFlag === '1') {
+          return this.$message.warning('委托编号为[' + item.id + ']的数据为启用，无法再次进行启用!');
+        }
+        if (item.validFlag === '0') {
+          ids.push(item.id)
+        }
+      }
+      this.subLoadingq = true
+      this.axios.post('pass/testManagement/v1/limstestentrusts/enable', ids, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.$message.success(res.message);
+          this.mainData();
+          this.mainData1();
+        } else {
+          this.$message.error(res.message)
+        }
+        this.subLoadingq = false
+      }).catch(e => {
+        this.subLoadingq = false
+        this.$message.error(e.message)
+      })
+    },
+    disable() {//停用
+      if (this.selectRows.length == 0) {
+        return this.$message.warning('请至少勾选一条您要停用的数据!');
+      }
+      let ids = []
+      for (let i = 0; i < this.selectRows.length; i++) {
+        let item = this.selectRows[i];
+        if (item.validFlag === '0') {
+          return this.$message.warning('委托编号为[' + item.id + ']的数据为停用，无法再次进行停用!');
+        }
+        if (item.validFlag === '1') {
+          ids.push(item.id)
+        }
+      }
+      this.subLoading = true
+      this.axios.post('pass/testManagement/v1/limstestentrusts/disable', ids, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.$message.success(res.message);
+          this.mainData();
+          this.mainData1();
+        } else {
+          this.$message.error(res.message)
+        }
+        this.subLoading = false
+      }).catch(e => {
+        this.subLoading = false
+        this.$message.error(e.message)
+      })
+    },
+    setFlag() {
+      this.showFlag = false
+      this.showFlag2 = false
+      this.showFlag3 = false
+    },
+    cancelData() {//取消提交
+      if (this.selectRows.length == 0) {
+        return this.$message.warning('请至少勾选一条您要取消提交的数据!');
+      }
+      // if (this.saveRow.stateFlag != 1) {
+      //   this.$message.warning('数据不是提交状态，不可取消提交！')
+      //   return
+      // }
+      let ids = []
+      for (let i = 0; i < this.selectRows.length; i++) {
+        let item = this.selectRows[i];
+        if (item.stateFlag === '0') {
+          return this.$message.warning('委托编号为[' + item.id + ']的数据为编辑状态，无法再次进行取消提交!');
+        }
+        if (item.validFlag === '1') {
+          ids.push(item.id)
+        }
+      }
+      this.subLoading = true
+      this.axios.post('pass/testManagement/v1/limstestentrusts/cancel', ids, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.$message.success(res.message);
+          this.mainData();
+          this.mainData1();
+        } else {
+          this.$message.error(res.message)
+        }
+        this.subLoading = false
+      }).catch(e => {
+        this.subLoading = false
+        this.$message.error(e.message)
+      })
+    },
+    // 打印条形码
+    printQRCode() {
+      if (this.selectRows.length == 0) {
+        this.$message.warning('请勾选您要打印的数据')
+        return
+      }
+      let flag = this.selectRows.some(u => u.stateFlag != 1)
+      if (flag) {
+        return this.$message.warning('未提交数据不允许进行打印，请重新进行勾选')
+      }
+      let entrIds = [];
+      this.selectRows.forEach(p => {
+        entrIds.push(p.entrId)
+      })
+      this.axios.post('pass/testManagement/v1/limssampleinfos/queryLimsSampleInfosPage', { object: { entrIds }, pageIndex: 1, pageSize: 200 }, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.$message.success(res.message);
+          this.printData = res.data.list
+          this.runPrint(this.printData)
+          this.searchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+    },
+    runPrint(arr) {
+      setTimeout(() => {
+        arr.forEach(item => {
+          item.createTime = item.createTime ? formatDate(item.createTime, 'yyyy-MM-dd') : '';
+          let newStr = item.sampleNo.replace('-U', '(筛上)').replace('-D', '(筛下)').replace('-B', '(边)')
+            .replace('-Z', '(中)').replace('-T', '(2mm)').replace('-H', '(合金)').replace('-R', '(熔渣)');
+          item.newSampleNo = newStr
+          JsBarcode(`#barcode${item.id}`, item.sampleNo, {
+            format: 'CODE128',
+            lineColor: '#000',
+            background: '#fff',
+            width: 1,
+            height: 15,
+            displayValue: false
+          })
+        })
+        setTimeout(() => {
+          this.printPage('printContent');
+        }, 1500)
+      }, 100);
+    },
+    searchFollow(row) {
+      this.saveRow = row
+      this.entrId = row.entrId ? row.entrId : ''
+      this.page2.pageNum = 1
+      this.page2.pageSize = 50
+      this.depData(this.entrId)
+      this.getRevMsg(this.entrId)
+      this.getSendMsg(this.entrId)
+    },
+    selectRow(val) {
+      this.selectRows = val
+    },
+    selectRow1(val) {
+      this.selectRow1s = val
+    },
+    getRevMsg(entrId) {
+      if (!entrId) {
+        return this.$message.warning('获取接收电文参数错误! entrId为空!')
+      }
+      this.dataLoading3 = true;
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryMsgByEntrId', { object: { entrId: entrId }, pageIndex: this.page2.pageNum, pageSize: this.page2.pageSize }, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.dataLoading3 = false;
+          this.table.list3 = res.data.list;
+        } else {
+          this.dataLoading3 = false;
+          return this.$message.warning(res.message)
+        }
+      }).catch(e => {
+        this.dataLoading3 = false;
+        return this.$message.error(e.message)
+      })
+    },
+    getSendMsg(entrId) {
+      if (!entrId) {
+        return this.$message.warning('获取发送电文参数错误! entrId为空!')
+      }
+      this.dataLoading4 = true;
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryMsgByEntrIdAndSampleNo', { object: { entrId: entrId }, pageIndex: this.page2.pageNum, pageSize: this.page2.pageSize }, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.dataLoading4 = false;
+          this.table.list4 = res.data.list;
+        } else {
+          this.dataLoading4 = false;
+          return this.$message.warning(res.message)
+        }
+      }).catch(e => {
+        this.dataLoading4 = false;
+        return this.$message.error(e.message)
+      })
+    },
+    depData(entrId) {
+      this.savaDep = {},
+        this.dataLoading2 = true;
+      this.axios.post('pass/testManagement/v1/limstestentrustds/queryLimsTestEntrustDPage', { object: { entrId: entrId }, pageIndex: this.page2.pageNum, pageSize: this.page2.pageSize }, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
+          this.table.list2 = res.data.list;
+          this.page2.totalPage = res.data.total;
+          this.table.list2.forEach(item => {
+            item.validFlag1 = item.validFlag === '0' ? '无效' : item.validFlag === '1' ? '有效' : ''
+          })
+        } else {
+          this.$message.error(res.message)
+        }
+        this.dataLoading2 = false;
+      }).catch(e => {
+        this.dataLoading2 = false;
+        this.$message.error(e.message)
+      });
+    },
+    reset() {
+      this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
+      this.search.planCompanyNo = '';
+      this.search.matName = ''
+      this.searchData();
+    },
+    pageSizeChange(size) {
+      this.page.pageSize = size;
+      this.mainData();
+      this.mainData1();
+    },
+    pageCurrentChange(index) {
+      this.page.pageNum = index;
+      this.mainData();
+      this.mainData1();
+    },
+    handleSelectionChange2(val) {
+      this.multipleSelection4 = val;
+    },
+    pageSizeChange2(size) {
+      this.page2.pageSize = size;
+      this.depData(this.entrId);
+    },
+    pageCurrentChange2(index) {
+      this.page2.pageNum = index;
+      this.depData(this.entrId);
+    },
+    addScreen() {
+      this.$nextTick(() => {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
+    },
+    addScreen2() {
+      this.$nextTick(() => {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
+    },
+    tableRowClassName({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 13) {
+        if (row.validFlag !== '1') {
+          return 'error-row';
+        }
+      }
+      if (columnIndex === 2) {
+        if (row.validFlag !== '1') {
+          return 'error-row';
+        }
+        if (row.stateFlag === '1') {
+          return 'error-green';
+        }
+        return '';
+      }
+    },
+    tableRowClassName2({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 5) {
+        if (row.validFlag !== '1') {
+          return 'error-row';
+        }
+        return '';
+      }
+    },
+    tableHeaderCellStyle() {
+      return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
+    }
+  }
+}
+</script>
+<style scoped></style>

src/views/entrustedManagement/components/spotCheck/spotCheck.vue

@@ -1,19 +1,27 @@
 <template>
   <div class="examination">
     <div class="common-head-search">
-        <el-form :inline="true">
+      <el-form :inline="true">
         <el-form-item label='委托单位'>
-          <el-select v-model="search.planCompanyNo" clearable filterable collapse-tags size="small" style="width:200px;margin-right: 10px;" placeholder="请选择查询内容">
-            <el-option v-for="item in entrOrgNameType" :key="item.baseName" :label="item.orgName"
-              :value="item.orgCode">
+          <el-select v-model="search.planCompanyNo" clearable filterable collapse-tags size="small"
+            style="width:200px;margin-right: 10px;" placeholder="请选择查询内容">
+            <el-option v-for="item in entrOrgNameType" :key="item.baseName" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label='物料名称'>
-          <el-input v-model="search.matName" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容" style="width: 200px;margin-right: 10px;"></el-input>
+          <el-input v-model="search.matName" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 200px;margin-right: 10px;"></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="search.times"
            type="daterange"
            range-separator="至"
@@ -23,7 +31,7 @@
            style="width:300px"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -34,152 +42,252 @@
     <!-- <el-tabs type="border-card" v-model="activeName">
           <el-tab-pane label="检验委托" name="first">
             <span slot="label">检验委托<el-badge :max="10" :hidden='page.totalPage == 0' style="margin-top:-18px" :value="page.totalPage"></el-badge></span>
-            
+
           </el-tab-pane>
           <el-tab-pane label="检验原料" name="second">
-            
+
           </el-tab-pane>
       </el-tabs> -->
-      <div class="common-title-div">
-              <div class="common-title-name">
-                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
-                检验原料信息
-              </div>
-              <div>
-              <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'sampling'" @click="ylCheckData">抽检</el-button>
-              <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'recheck'" @click="ylUncheckData">复检</el-button>
-              </div>
-            </div>
-            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-               <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top" highlight-current-row @selection-change="ylHandleSelectionChange" :data="table.ylList" :icore-filter-flag="icoreFilterFlag"
-               :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName" :summary-method="getSummaries" show-summary>
-                <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
-                <el-table-column type="selection" width="55"  fixed="left" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlag1" label="状态" align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托编号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="委托样号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName" label="取样频次" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName" label="计划单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName" label="检验单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="检验班组" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTime1" label="委托日期" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"  align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName" label="样品类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName" label="检验类型"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName" label="物料分类" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName" label="试样形状" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"  align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
-              </el-table>
-            </div>
-            <div class="common-foot-style">
-                <el-pagination @size-change="ylPageSizeChange" @current-change="ylPageCurrentChange"
-                  :current-page="page3.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page3.pageSize" layout="total, sizes, prev, pager, next, jumper"
-                  :total="page3.totalPage" background>
-                </el-pagination>
-            </div>
-      <div class="common-title-div">
-              <div class="common-title-name">
-                <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
-                检验委托信息
-              </div>
-              <div>
-              <!-- <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'sampling'" @click="checkData">抽检</el-button>
+    <div class="common-title-div">
+      <div class="common-title-name">
+        <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+        检验原料信息
+      </div>
+      <div>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'sampling'"
+          @click="ylCheckData">抽检</el-button>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'recheck'"
+          @click="ylUncheckData">复检</el-button>
+      </div>
+    </div>
+    <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+      <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top"
+        highlight-current-row @selection-change="ylHandleSelectionChange" :data="table.ylList"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+        :cell-class-name="tableRowClassName" :summary-method="getSummaries" show-summary>
+        <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+        <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlag1" label="状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="委托样号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName" label="取样频次"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName" label="计划单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName" label="检验单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="检验班组"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTime1" label="委托日期"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName" label="样品类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName" label="检验类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName" label="物料分类"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName" label="试样形状"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+          align="center"></el-table-column>
+      </el-table>
+    </div>
+    <div class="common-foot-style">
+      <el-pagination @size-change="ylPageSizeChange" @current-change="ylPageCurrentChange" :current-page="page3.pageNum"
+        :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page3.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="page3.totalPage" background>
+      </el-pagination>
+    </div>
+    <div class="common-title-div">
+      <div class="common-title-name">
+        <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
+        检验委托信息
+      </div>
+      <div>
+        <!-- <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'sampling'" @click="checkData">抽检</el-button>
               <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'recheck'" @click="uncheckData">复检</el-button> -->
-               <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'delete'" @click="deleteData2">停用</el-button>
-               <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'submit'" @click="submitData2">提交</el-button>
-              </div>
-            </div>
-            <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-               <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top" highlight-current-row @selection-change="handleSelectionChange" :data="table.list" :icore-filter-flag="icoreFilterFlag"
-               :header-cell-style="tableHeaderCellStyle" @cell-click='searchFollow' :cell-class-name="tableRowClassName" :summary-method="getSummaries" show-summary>
-                <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
-                <el-table-column type="selection" width="55"  fixed="left" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlag1" label="状态" align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托编号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="委托样号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName" label="取样频次" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName" label="计划单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName" label="检验单位" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="检验班组" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTime1" label="委托日期" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"  align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName" label="样品类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName" label="检验类型"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName" label="物料分类" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName" label="试样形状" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"  align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"  align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-                <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
-              </el-table>
-            </div>
-            <div class="common-foot-style">
-                <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
-                  :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-                  :total="page.totalPage" background>
-                </el-pagination>
-            </div>
+        <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'delete'"
+          @click="deleteData2">停用</el-button>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'submit'"
+          @click="submitData2">提交</el-button>
+      </div>
+    </div>
+    <div class="common-table-div" style="margin-bottom:0;margin-top:0">
+      <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top"
+        highlight-current-row @selection-change="handleSelectionChange" :data="table.list"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle" @cell-click='searchFollow'
+        :cell-class-name="tableRowClassName" :summary-method="getSummaries" show-summary>
+        <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+        <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlag1" label="状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="contractNo" label="合同号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="suppName" label="供应商"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="委托样号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matOrigin" label="产地"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="transportTypeName" label="运输类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="acceptName" label="收货单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sendPlace" label="发站"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="packTypeName" label="包装方式"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiq1" label="是否商检"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatch1" label="是否配批"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="smpDeliName" label="取样频次"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="unloadPlace" label="卸货地点"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="lotsNo" label="送货批次"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planCompanyName" label="计划单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="companyName" label="检验单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="deptName" label="检验车间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="检验班组"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTime1" label="委托日期"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="pointName" label="取样地点"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpCompanyName" label="采样单位"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="smpDeptName" label="采样车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="smpSectionName" label="采样班组"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName" label="样品类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="testTypeName" label="检验类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matClassName" label="物料分类"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matShapeName" label="试样形状"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="spec" label="规格"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="netWgt" label="重量(t)"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleNum" label="样品数量"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleWgt" label="样品重量"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planNo" label="计量预报号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="entTime" label="进厂时间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testCost" label="检测费用"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isSmp1" label="是否取样"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isPrep1" label="是否组合"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isCheck1" label="是否外检"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isMater1" label="是否计量"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+          align="center"></el-table-column>
+      </el-table>
+    </div>
+    <div class="common-foot-style">
+      <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="page.pageNum"
+        :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+      </el-pagination>
+    </div>
     <!-- <div class="common-title-div">
       <div class="common-title-name">
         <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
@@ -222,14 +330,14 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  data () {
+  data() {
     return {
       table: {
         list: [],
         list2: [],
-        ylList:[]
+        ylList: []
       },
-      activeName:'first',
+      activeName: 'first',
       dataLoading: false,
       dataLoading2: false,
       icoreFilterFlag: true,
@@ -243,7 +351,7 @@ export default {
         pageNum: 1,
         totalPage: 0
       },
-       page3: {
+      page3: {
         pageSize: 200,
         pageNum: 1,
         totalPage: 0
@@ -257,28 +365,28 @@ export default {
       entrOrgNameType: [],
       entrOrgNameType1: [],
       sampleTypeNameType: [],
-      ylMultipleSelection3:[],
+      ylMultipleSelection3: [],
       multipleSelection3: [],
       multipleSelection4: [],
       search: {
         entrTime: '',
-        times:[],
+        times: [],
         planCompanyName: '',
         matName: ''
       },
-      height_top:0,
-      height_bot:0,
-      activeMenu:''
+      height_top: 0,
+      height_bot: 0,
+      activeMenu: ''
     }
   },
   created() {
-    this.height_top = window.innerHeight / 2 - 130< 249 ? 249 : window.innerHeight / 2 - 120;
-    this.height_bot = window.innerHeight / 2 - 130< 249 ? 249 : window.innerHeight / 2 - 120;
-    this.search.times=  [this.getYNM(new Date()), this.getYNM(new Date())] 
+    this.height_top = window.innerHeight / 2 - 130 < 249 ? 249 : window.innerHeight / 2 - 120;
+    this.height_bot = window.innerHeight / 2 - 130 < 249 ? 249 : window.innerHeight / 2 - 120;
+    this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
   },
-  mounted () {
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{}, {individualType: 'json'}).then(response => {
+  mounted() {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: 'json' }).then(response => {
       this.entrOrgNameType = response.data
     });
     // this.getentrOrgNameTypeList();
@@ -305,142 +413,142 @@ export default {
         }
         if (index === 1) {
           sums[index] = data.length;
-        } 
+        }
       });
-      return sums;   
-    }, 
-    refresh () {
+      return sums;
+    },
+    refresh() {
       this.mainData();
     },
-    refresh2 () {
+    refresh2() {
       this.depData(this.planId);
     },
-    checkData () {
-       let _this = this;
-        if (_this.multipleSelection3.length < 1) {
+    checkData() {
+      let _this = this;
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要抽检的数据！')
         return
-       } 
-        _this.axios.post('pass/testManagement/v1/limstestentrusts/check', _this.multipleSelection3, {individualType: 'json'}).then(res => {
+      }
+      _this.axios.post('pass/testManagement/v1/limstestentrusts/check', _this.multipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('抽检成功');
-         _this.refresh()
+          this.$message.success('抽检成功');
+          _this.refresh()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
-       })
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    uncheckData () {
+    uncheckData() {
       let _this = this;
-       if (_this.multipleSelection3.length < 1) {
-       this.$message.warning('请勾选您要复检的数据！')
-       return
-       }
-       _this.axios.post('pass/testManagement/v1/limstestentrusts/uncheck', _this.multipleSelection3, {individualType: 'json'}).then(res => {
-       if (res.succeed) {
-        this.$message.success('复检成功');
-        _this.refresh()
-       } else {
-        this.$message.error(res.message)
-       }
-       }).catch(e => {
+      if (_this.multipleSelection3.length < 1) {
+        this.$message.warning('请勾选您要复检的数据！')
+        return
+      }
+      _this.axios.post('pass/testManagement/v1/limstestentrusts/uncheck', _this.multipleSelection3, { individualType: 'json' }).then(res => {
+        if (res.succeed) {
+          this.$message.success('复检成功');
+          _this.refresh()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(e => {
         this.$message.error(e.message)
       })
     },
-    ylCheckData () {
-       let _this = this;
-        if (_this.ylMultipleSelection3.length < 1) {
+    ylCheckData() {
+      let _this = this;
+      if (_this.ylMultipleSelection3.length < 1) {
         this.$message.warning('请勾选您要抽检的数据！')
         return
-       } 
-        _this.axios.post('pass/testManagement/v1/limstestentrusts/check', _this.ylMultipleSelection3, {individualType: 'json'}).then(res => {
+      }
+      _this.axios.post('pass/testManagement/v1/limstestentrusts/check', _this.ylMultipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('抽检成功');
-         _this.searchData()
+          this.$message.success('抽检成功');
+          _this.searchData()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
-       })
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    ylUncheckData () {
+    ylUncheckData() {
       let _this = this;
-       if (_this.ylMultipleSelection3.length < 1) {
-       this.$message.warning('请勾选您要复检的数据！')
-       return
-       }
-       _this.axios.post('pass/testManagement/v1/limstestentrusts/uncheck', _this.ylMultipleSelection3, {individualType: 'json'}).then(res => {
-       if (res.succeed) {
-        this.$message.success('复检成功');
-        _this.searchData()
-       } else {
-        this.$message.error(res.message)
-       }
-       }).catch(e => {
+      if (_this.ylMultipleSelection3.length < 1) {
+        this.$message.warning('请勾选您要复检的数据！')
+        return
+      }
+      _this.axios.post('pass/testManagement/v1/limstestentrusts/uncheck', _this.ylMultipleSelection3, { individualType: 'json' }).then(res => {
+        if (res.succeed) {
+          this.$message.success('复检成功');
+          _this.searchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(e => {
         this.$message.error(e.message)
       })
     },
-    deleteData2 () {
-       let _this = this;
-       if (_this.multipleSelection3.length < 1) {
+    deleteData2() {
+      let _this = this;
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要停用的数据！')
       } else {
         for (var j = 0; j < _this.multipleSelection3.length; j++) {
           if (_this.multipleSelection3[j].validFlag === '0') {
-          this.$message.warning('请勾选状态为已启用的数据！')
-          return
+            this.$message.warning('请勾选状态为已启用的数据！')
+            return
           }
         }
         _this.dialogTableVisible = false;
         for (var i = 0; i < _this.multipleSelection3.length; i++) {
-        _this.multipleSelection3[i].updateMan = userName;
-        _this.multipleSelection3[i].updateNo = userId
-        }
-        _this.axios.post('pass/testManagement/v1/limstestentrusts/abolish', _this.multipleSelection3, {individualType: 'json'}).then(res => {
-        if (res.succeed) {
-         this.$message.success('停用操作成功');
-         _this.mainData()
-        } else {
-         this.$message.error(res.message)
+          _this.multipleSelection3[i].updateMan = userName;
+          _this.multipleSelection3[i].updateNo = userId
         }
+        _this.axios.post('pass/testManagement/v1/limstestentrusts/abolish', _this.multipleSelection3, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.$message.success('停用操作成功');
+            _this.mainData()
+          } else {
+            this.$message.error(res.message)
+          }
         }).catch(e => {
-         this.$message.error(e.message)
-       })
+          this.$message.error(e.message)
+        })
       }
     },
-    submitData2 () {
-       let _this = this;
-        if (_this.multipleSelection3.length < 1) {
+    submitData2() {
+      let _this = this;
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要提交的数据！')
       } else {
-        for (var j= 0; j < _this.multipleSelection3.length; j++) {
+        for (var j = 0; j < _this.multipleSelection3.length; j++) {
           if (_this.multipleSelection3[j].stateFlag === '1') {
-          this.$message.warning('请勾选状态为编辑的数据！')  
-          return
+            this.$message.warning('请勾选状态为编辑的数据！')
+            return
           }
         }
-        let ids = this.multipleSelection3.map(item =>item.id)
+        let ids = this.multipleSelection3.map(item => item.id)
         _this.dialogTableVisible2 = false;
         // for (var i = 0; i < _this.multipleSelection4.length; i++) {
         // _this.multipleSelection4[i].updateMan = userName;
         // _this.multipleSelection4[i].updateNo = userId
         // }
-        _this.axios.post('pass/testManagement/v1/limstestentrusts/submit', ids, {individualType: 'json'}).then(res => {
-        if (res.succeed) {
-         this.$message.success('提交成功');
-         _this.mainData()
-        } else {
-         this.$message.error(res.message)
-        }
+        _this.axios.post('pass/testManagement/v1/limstestentrusts/submit', ids, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.$message.success('提交成功');
+            _this.mainData()
+          } else {
+            this.$message.error(res.message)
+          }
         }).catch(e => {
-         this.$message.error(e.message)
-       })
+          this.$message.error(e.message)
+        })
       }
     },
-    searchData(){
+    searchData() {
       this.page.pageNum = 1
       this.page.pageSize = 200
       this.page3.pageNum = 1
@@ -448,79 +556,79 @@ export default {
       this.ylMainData()
       this.mainData()
     },
-    mainData () {
-        let startTime =''
-        let endTime = ''
-        if (!this.search.times) {
-          startTime = ''
-          endTime = ''
-        }else {
-          startTime = formatDate(this.search.times[0], "yyyy-MM-dd") + ' 00:00:00'
-          endTime = formatDate(this.search.times[1], "yyyy-MM-dd") + ' 23:59:59'
-        }
-        let tempobj = {
-          'object':{
-            "sampleTypeCode": "",
-            'isBatch':'',
-            'planCompanyNo': this.search.planCompanyNo,
-            'matName': this.search.matName,
-            validFlag:1
-          },
-          'list':[480302,480305],
-          'pageIndex':this.page.pageNum,
-          'pageSize':this.page.pageSize,
-          'startTime':startTime,
-          'endTime':endTime
-        }
-        this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage/', tempobj,{individualType: 'json'}).then(res => {
-          this.dataLoading = false;
-          this.table.list = res.data.list;
-          this.table.list.forEach(item =>{
-            item.stateFlag1 = item.stateFlag === '0' ? '编辑' : item.stateFlag === '1' ? '提交' : ''
-            item.isCiq1 = item.isCiq === '0' ? '否' : item.isCiq === '1' ? '是' : ''
-            item.isBatch1 = item.isBatch === '0' ? '否' : item.isBatch === '1' ? '是' : ''
-            item.isSmp1 = item.isSmp === '0' ? '否' : item.isSmp === '1' ? '是' : ''
-            item.isPrep1 = item.isPrep === '0' ? '否' : item.isPrep === '1' ? '是' : ''
-            item.isCheck1 = item.isCheck === '0' ? '否' : item.isCheck === '1' ? '是' : ''
-            item.isMater1 = item.isMater === '0' ? '否' : item.isMater === '1' ? '是' : ''
-            item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd')
-          })
-          // if (this.table.list.length > 0) {
-          //   this.$refs.dataTable.setCurrentRow(this.table.list[0])
-          //   this.searchFollow(this.table.list[0])  
-          // }
-          this.page.totalPage = res.data.total;
-        }).catch(e => {
-          this.dataLoading = false;
-        });
+    mainData() {
+      let startTime = ''
+      let endTime = ''
+      if (!this.search.times) {
+        startTime = ''
+        endTime = ''
+      } else {
+        startTime = formatDate(this.search.times[0], "yyyy-MM-dd") + ' 00:00:00'
+        endTime = formatDate(this.search.times[1], "yyyy-MM-dd") + ' 23:59:59'
+      }
+      let tempobj = {
+        'object': {
+          "sampleTypeCode": "",
+          'isBatch': '',
+          'planCompanyNo': this.search.planCompanyNo,
+          'matName': this.search.matName,
+          validFlag: 1
+        },
+        'list': [480302, 480305],
+        'pageIndex': this.page.pageNum,
+        'pageSize': this.page.pageSize,
+        'startTime': startTime,
+        'endTime': endTime
+      }
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage/', tempobj, { individualType: 'json' }).then(res => {
+        this.dataLoading = false;
+        this.table.list = res.data.list;
+        this.table.list.forEach(item => {
+          item.stateFlag1 = item.stateFlag === '0' ? '编辑' : item.stateFlag === '1' ? '提交' : ''
+          item.isCiq1 = item.isCiq === '0' ? '否' : item.isCiq === '1' ? '是' : ''
+          item.isBatch1 = item.isBatch === '0' ? '否' : item.isBatch === '1' ? '是' : ''
+          item.isSmp1 = item.isSmp === '0' ? '否' : item.isSmp === '1' ? '是' : ''
+          item.isPrep1 = item.isPrep === '0' ? '否' : item.isPrep === '1' ? '是' : ''
+          item.isCheck1 = item.isCheck === '0' ? '否' : item.isCheck === '1' ? '是' : ''
+          item.isMater1 = item.isMater === '0' ? '否' : item.isMater === '1' ? '是' : ''
+          item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd')
+        })
+        // if (this.table.list.length > 0) {
+        //   this.$refs.dataTable.setCurrentRow(this.table.list[0])
+        //   this.searchFollow(this.table.list[0])
+        // }
+        this.page.totalPage = res.data.total;
+      }).catch(e => {
+        this.dataLoading = false;
+      });
     },
-    ylMainData () {
+    ylMainData() {
       this.saveRow = {}
       this.dataLoading = true;
       if (!this.search.times) {
         this.startTime = ''
         this.endTime = ''
-      }else {
+      } else {
         this.startTime = this.getYNM(new Date) + ' 00:00:00'
-        this.endTime = this.getYNM(new Date)  + ' 23:59:59'
+        this.endTime = this.getYNM(new Date) + ' 23:59:59'
       }
       let obj = {
-        object:{
-          entrOrgNo:this.search.planCompanyNo, // 委托单位
-          sampleTypeCode:480101,
-          matName:this.search.matName,
-          stateFlag:1
+        object: {
+          entrOrgNo: this.search.planCompanyNo, // 委托单位
+          sampleTypeCode: 480101,
+          matName: this.search.matName,
+          stateFlag: 1
         },
-        list:[480301],
+        list: [480301],
         'startTime': this.startTime,
-        'endTime':this.endTime,
-        pageIndex:this.page3.pageNum,
-        pageSize:this.page3.pageSize
+        'endTime': this.endTime,
+        pageIndex: this.page3.pageNum,
+        pageSize: this.page3.pageSize
       }
-      this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage', obj, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage', obj, { individualType: 'json' }).then(res => {
         this.dataLoading = false;
         this.table.ylList = res.data.list;
-        this.table.ylList.forEach(item =>{
+        this.table.ylList.forEach(item => {
           item.stateFlag1 = item.stateFlag === '0' ? '编辑' : item.stateFlag === '1' ? '提交' : ''
           item.isCiq1 = item.isCiq === '0' ? '否' : item.isCiq === '1' ? '是' : ''
           item.isBatch1 = item.isBatch === '0' ? '否' : item.isBatch === '1' ? '是' : ''
@@ -531,9 +639,9 @@ export default {
           item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd')
         })
         this.page3.totalPage = res.data.total;
-        }).catch(e => {
-          this.dataLoading = false;
-        });
+      }).catch(e => {
+        this.dataLoading = false;
+      });
     },
     searchFollow(row) {
       this.planId = row.entrId ? row.entrId : ''
@@ -541,12 +649,12 @@ export default {
       this.page2.pageSize = 50
       this.depData(this.planId)
     },
-    depData (planId) { 
+    depData(planId) {
       this.dataLoading2 = true;
-      this.axios.post('pass/testManagement/v1/limstestentrustds/queryLimsTestEntrustDPage', {object:{entrId:planId},pageIndex:this.page2.pageNum,pageSize:this.page2.pageSize}, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestentrustds/queryLimsTestEntrustDPage', { object: { entrId: planId }, pageIndex: this.page2.pageNum, pageSize: this.page2.pageSize }, { individualType: 'json' }).then(res => {
         this.dataLoading2 = false;
         this.table.list2 = res.data.list;
-        this.table.list2.forEach(item =>{
+        this.table.list2.forEach(item => {
           item.validFlag1 = item.validFlag === '0' ? '无效' : item.validFlag === '1' ? '有效' : ''
         })
         this.page2.totalPage = res.data.total;
@@ -554,92 +662,91 @@ export default {
         this.dataLoading2 = false;
       });
     },
-    reset () {
+    reset() {
       let _this = this;
       _this.search.times = [this.getYNM(new Date()), this.getYNM(new Date())]
       _this.search.planCompanyNo = '';
       _this.search.matName = '';
       _this.searchData();
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.multipleSelection3 = val;
     },
-    ylHandleSelectionChange (val) {
+    ylHandleSelectionChange(val) {
       this.ylMultipleSelection3 = val;
     },
-    pageSizeChange (size) {
+    pageSizeChange(size) {
       this.page.pageSize = size;
       this.mainData();
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.page.pageNum = index;
       this.mainData();
     },
-    ylPageSizeChange (size) {
+    ylPageSizeChange(size) {
       this.page3.pageSize = size;
       this.ylMainData();
     },
-    ylPageCurrentChange (index) {
+    ylPageCurrentChange(index) {
       this.page3.pageNum = index;
       this.ylMainData();
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.multipleSelection4 = val;
     },
-    pageSizeChange2 (size) {
+    pageSizeChange2(size) {
       this.page2.pageSize = size;
       this.depData(this.planId);
     },
-    pageCurrentChange2 (index) {
+    pageCurrentChange2(index) {
       this.page2.pageNum = index;
       this.depData(this.planId);
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    addScreen2 () {
-     this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+    addScreen2() {
+      this.$nextTick(() => {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-   tableRowClassName ({
-        row, column, rowIndex, columnIndex
-      }) {
-        if (columnIndex === 13) {
+    tableRowClassName({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 13) {
         if (row.validFlag !== '1') {
           return 'error-row';
         }
-        }
-        if (columnIndex === 2) {
+      }
+      if (columnIndex === 2) {
         if (row.stateFlag === '1') {
           return 'error-green';
         }
         return '';
-        }
-      },
-    tableRowClassName2 ({
-        row, column, rowIndex, columnIndex
-      }) {
-        if (columnIndex === 5) {
+      }
+    },
+    tableRowClassName2({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 5) {
         if (row.validFlag !== '1') {
           return 'error-row';
         }
         return '';
-        }
-      },
-    tableHeaderCellStyle () {
+      }
+    },
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style  scoped>
-</style>
+<style scoped></style>

src/views/entrustedManagement/router/index.js

@@ -43,6 +43,10 @@ const constantRouterMap = [{
       path: 'businessKanban',
       name: 'businessKanban',
       component: resolve => require(['../components/businessKanban/businessKanban.vue'], resolve)
+    },{
+      path: 'inspectionMaterialsGit',
+      name: 'inspectionMaterialsGit',
+      component: resolve => require(['../components/inspectionMaterials/inspectionMaterialsGit.vue'], resolve)
     }
     ],
 }];

src/views/programManagement/components/interimPlanManagement/interimPlanManagement.vue

@@ -9,7 +9,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label='计划日期'>
-          <el-date-picker
+          <el-date-picker v-model="search.planDate[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 150px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.planDate[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 150px">
+          </el-date-picker>
+          <!-- <el-date-picker
          v-model="search.planDate"
          type="daterange"
          range-separator="至"
@@ -18,7 +25,7 @@
          size="small"
          format="yyyy-MM-dd"
          value-format="yyyy-MM-dd">
-        </el-date-picker>
+        </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -32,65 +39,104 @@
         临时计划
       </div>
       <div>
-      <el-button icon="el-icon-circle-plus-outline" type="goon" v-privilege="activeMenu + 'ADD'" size="mini" @click="addData">新增</el-button>
-      <el-button icon="el-icon-edit" type="goon" size="mini" v-privilege="activeMenu + 'PUT'" @click="modifyData">修改</el-button>
-      <el-button icon="el-icon-remove-outline" type="danger" v-privilege="activeMenu + 'disable'" size="mini" @click="deleteData">停用</el-button>
-      <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'" @click="recoverData">启用</el-button>
-      <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'submit'" @click="submitData">提交</el-button>
-      <el-button icon="el-icon-back" type="danger" size="mini" :loading='returnSubLoading' v-privilege="activeMenu + 'submit'"  @click="returnSubmit">取消提交</el-button>
-      <el-button icon="el-icon-audit" type="goon" size="mini" :loading='subLoading1' v-privilege="activeMenu + 'shenhe'" @click="checkData">审核</el-button>
-           <el-button icon="el-icon-noaudit" type="danger" size="mini" :loading='returnSubLoading1' v-privilege="activeMenu + 'shenhe'" @click="uncheckData">取消审核</el-button>
+        <el-button icon="el-icon-circle-plus-outline" type="goon" v-privilege="activeMenu + 'ADD'" size="mini"
+          @click="addData">新增</el-button>
+        <el-button icon="el-icon-edit" type="goon" size="mini" v-privilege="activeMenu + 'PUT'"
+          @click="modifyData">修改</el-button>
+        <el-button icon="el-icon-remove-outline" type="danger" v-privilege="activeMenu + 'disable'" size="mini"
+          @click="deleteData">停用</el-button>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'"
+          @click="recoverData">启用</el-button>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'submit'"
+          @click="submitData">提交</el-button>
+        <el-button icon="el-icon-back" type="danger" size="mini" :loading='returnSubLoading'
+          v-privilege="activeMenu + 'submit'" @click="returnSubmit">取消提交</el-button>
+        <el-button icon="el-icon-audit" type="goon" size="mini" :loading='subLoading1'
+          v-privilege="activeMenu + 'shenhe'" @click="checkData">审核</el-button>
+        <el-button icon="el-icon-noaudit" type="danger" size="mini" :loading='returnSubLoading1'
+          v-privilege="activeMenu + 'shenhe'" @click="uncheckData">取消审核</el-button>
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-       <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top" highlight-current-row @selection-change="handleSelectionChange" :data="table.list" :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle" @cell-click='searchFollow' :cell-class-name="tableCellClassName" :row-class-name="tableRowClassName" :summary-method="getSummaries" show-summary>
+      <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top"
+        highlight-current-row @selection-change="handleSelectionChange" :data="table.list"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle" @cell-click='searchFollow'
+        :cell-class-name="tableCellClassName" :row-class-name="tableRowClassName" :summary-method="getSummaries"
+        show-summary>
         <el-table-column type="index" label="NO" align="center"></el-table-column>
         <el-table-column type="selection" width="55" align="center"></el-table-column>
-         <el-table-column :show-overflow-tooltip="true" sortable min-width="90px"  prop="validFlag1" label="数据状态" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stateFlag1" label="状态" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDate1" label="计划日期" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrTypeName" label="委托类型" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planCompanyName" label="计划单位" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planDeptName" label="计划车间" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planName" label="计划名称" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="validFlag1" label="数据状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stateFlag1" label="状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDate1" label="计划日期"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrTypeName" label="委托类型"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planCompanyName" label="计划单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planDeptName" label="计划车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planName" label="计划名称"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="140px" prop="deptName" label="计划车间" align="center"></el-table-column> -->
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sampleTypeName" label="样品类型" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="matName" label="物料名称" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sampleTypeName" label="样品类型"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="matName" label="物料名称"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="140px" prop="planDate1" label="计划日期" align="center"></el-table-column> -->
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="companyName" label="检验单位"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="deptName" label="检验车间"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sectionName" label="检验班组"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpCompanyName" label="取样单位"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeptName" label="取样车间"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpSectionName" label="取样班组"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeliName" label="送样频次" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="pointName" label="取样地点"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="planName" label="计划名称"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="planDesc" label="计划说明"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="testLimit" label="测试时限(小时)"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="isSmp1" label="是否取样"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="isBatch1" label="是否组批"  align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="companyName" label="检验单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="deptName" label="检验车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sectionName" label="检验班组"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpCompanyName" label="取样单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeptName" label="取样车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpSectionName" label="取样班组"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeliName" label="送样频次"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="pointName" label="取样地点"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="planName" label="计划名称"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="planDesc" label="计划说明"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="testLimit" label="测试时限(小时)"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="isSmp1" label="是否取样"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="isBatch1" label="是否组批"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="100px" prop="testTime1" label="测试起始时间" align="center"></el-table-column>
         <el-table-column sortable width="130px" prop="durTime" label="间隔时间（小时）" align="center"></el-table-column> -->
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="planCompanyName" label="委托单位" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="testTypeName" label="检验类型" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="planCompanyName" label="委托单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="testTypeName" label="检验类型"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="90px"  prop="validFlag1" label="状态" align="center"></el-table-column> -->
-          <!-- <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
               <span v-if="scope.row.validFlag == 1">已启用</span>
               <span v-else-if="scope.row.validFlag == 0">已停用</span>
           </template> -->
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="memo" label="备注" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="200px" prop="memo" label="备注"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="createMan" label="创建人"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="createTime" label="创建时间"
+          align="center"></el-table-column>
       </el-table>
     </div>
     <div class="common-foot-style">
-        <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
-          :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-          :total="page.totalPage" background>
-        </el-pagination>
+      <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="page.pageNum"
+        :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+      </el-pagination>
     </div>
     <div class="common-title-div">
       <div class="common-title-name">
@@ -98,29 +144,46 @@
         分析项目
       </div>
       <div>
-      <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" v-privilege="activeMenu + 'addDep'" @click="addData2">新增</el-button>
-      <el-button icon="el-icon-edit" type="goon" size="mini" v-privilege="activeMenu + 'modifyDep'" @click="modifyData2">修改</el-button>
-      <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="copyData2">复制</el-button> -->
-      <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'delete'" @click="deleteData2">删除</el-button>
-      <!-- <el-button icon="el-icon-check" type="goon" size="mini" @click="recoverData2">启用</el-button> -->
+        <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" v-privilege="activeMenu + 'addDep'"
+          @click="addData2">新增</el-button>
+        <el-button icon="el-icon-edit" type="goon" size="mini" v-privilege="activeMenu + 'modifyDep'"
+          @click="modifyData2">修改</el-button>
+        <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="copyData2">复制</el-button> -->
+        <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'delete'"
+          @click="deleteData2">删除</el-button>
+        <!-- <el-button icon="el-icon-check" type="goon" size="mini" @click="recoverData2">启用</el-button> -->
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-       <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" highlight-current-row @row-click='saveData' :data="table.list2.slice((this.page2.pageNum -1)*this.page2.pageSize,this.page2.pageNum*this.page2.pageSize)" :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
+      <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" highlight-current-row
+        @row-click='saveData'
+        :data="table.list2.slice((this.page2.pageNum - 1) * this.page2.pageSize, this.page2.pageNum * this.page2.pageSize)"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+        :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
         <el-table-column type="index" label="NO" fixed="left" align="center">
         </el-table-column>
-         <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="validFlag" label="状态" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planIdD" label="计划单子号" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planId" label="计划单号" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="anlyItemName" label="分析项目" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="maxSign" label="上限符" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="maxValue" label="上限值" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="minSign" label="下限符" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="minValue" label="下限值" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="createMan" label="创建人" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="createTime" label="创建时间" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="memo" label="备注" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="validFlag" label="状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planIdD" label="计划单子号"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="planId" label="计划单号"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="anlyItemName" label="分析项目"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="maxSign" label="上限符"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="maxValue" label="上限值"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="minSign" label="下限符"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="minValue" label="下限值"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="createMan" label="创建人"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="90px" prop="createTime" label="创建时间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="140px" prop="memo" label="备注"
+          align="center"></el-table-column>
       </el-table>
     </div>
     <!-- <div class="common-foot-style">
@@ -138,12 +201,12 @@
         <el-row>
           <el-col :span='12'>
             <el-form-item prop="maxSignTypeIndex" label="上限符">
-                  <el-select v-model="baseData.maxSign" filterable collapse-tags size="small" style="width:100%">
-                    <el-option v-for="(item,index) in maxSignType" :key="index" :label="item.maxSign"
-                      :value="item.maxSign">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
+              <el-select v-model="baseData.maxSign" filterable collapse-tags size="small" style="width:100%">
+                <el-option v-for="(item, index) in maxSignType" :key="index" :label="item.maxSign"
+                  :value="item.maxSign">
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span='12'>
             <el-form-item label="最大值">
@@ -154,11 +217,11 @@
         <el-row>
           <el-col :span='12'>
             <el-form-item prop="minSignTypeIndex" label="下限符">
-             <el-select v-model="baseData.minSign" filterable collapse-tags size="small" style="width:100%">
-               <el-option v-for="(item,index) in minSignType" :key="index" :label="item.minSign"
-                 :value="item.minSign">
-               </el-option>
-             </el-select>
+              <el-select v-model="baseData.minSign" filterable collapse-tags size="small" style="width:100%">
+                <el-option v-for="(item, index) in minSignType" :key="index" :label="item.minSign"
+                  :value="item.minSign">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span='12'>
@@ -169,8 +232,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="goon"  icon="el-icon-check" size="mini" @click="fxaddData()">确定</el-button>
-        <el-button size="mini"  type="goon" icon="el-icon-remove-outline" @click="fxcloseDialog">取消</el-button>
+        <el-button type="goon" icon="el-icon-check" size="mini" @click="fxaddData()">确定</el-button>
+        <el-button size="mini" type="goon" icon="el-icon-remove-outline" @click="fxcloseDialog">取消</el-button>
       </span>
     </el-dialog>
     <div is="alertComponets" :showFlag="showFlag" :Params="Params" @refresh='refresh'></div>
@@ -191,8 +254,8 @@ import alertComponets2 from './alertComponents2';
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  components: {alertComponets, alertComponets2},
-  data () {
+  components: { alertComponets, alertComponets2 },
+  data() {
     return {
       table: {
         list: [],
@@ -201,10 +264,10 @@ export default {
       dataLoading: false,
       dataLoading2: false,
       icoreFilterFlag: true,
-      fxdialogTableVisible:false,
+      fxdialogTableVisible: false,
       minSignType: [{ minSign: ">=" }, { minSign: ">" }],
       maxSignType: [{ maxSign: "<=" }, { maxSign: "<" }],
-      baseData:{},
+      baseData: {},
       page: {
         pageSize: 200,
         pageNum: 1,
@@ -216,38 +279,38 @@ export default {
         totalPage: 0
       },
       list: [],
-      planSave:{},
-      saveRow:{},
+      planSave: {},
+      saveRow: {},
       planId: '',
       showFlag: false,
       Params: {},
       showFlag2: false,
       Params2: {},
-      height_top:0,
-      height_bot:0,
+      height_top: 0,
+      height_bot: 0,
       companyNameType: [],
       companyNameType1: [],
       sampleTypeNameType: [],
       multipleSelection3: [],
       multipleSelection4: [],
-      returnSubLoading:false,
-      subLoading1:false,
-      returnSubLoading1:false,
+      returnSubLoading: false,
+      subLoading1: false,
+      returnSubLoading1: false,
       search: {
         planDate: [],
         companyName: ''
       },
-      activeMenu:''
+      activeMenu: ''
     }
   },
   created() {
     this.height_top = window.innerHeight / 2 - 130 < 249 ? 249 : window.innerHeight / 2 - 110;
     this.height_bot = window.innerHeight / 2 - 140 < 249 ? 249 : window.innerHeight / 2 - 110;
-    this.search.planDate=  [this.getYNM(new Date()), this.getYNM(new Date())]
+    this.search.planDate = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
   },
-  mounted () {
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{}, {individualType: 'json'}).then(response => {
+  mounted() {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: 'json' }).then(response => {
       this.companyNameType = response.data
     });
     this.searchData();
@@ -277,21 +340,21 @@ export default {
       });
       return sums;
     },
-    refresh () {
+    refresh() {
       this.mainData();
     },
-    refresh2 () {
+    refresh2() {
       this.depData(this.saveRow.planId)
     },
-    saveData(row){
-    this.planSave = Object.assign({},row)
-  },
-   addData () {
+    saveData(row) {
+      this.planSave = Object.assign({}, row)
+    },
+    addData() {
       let _this = this;
       _this.showFlag = !_this.showFlag;
       _this.Params = null;
     },
-    modifyData () {
+    modifyData() {
       let _this = this;
       if (_this.multipleSelection3.length !== 1) {
         this.$message.warning('请勾选您要修改的一条数据！')
@@ -304,56 +367,56 @@ export default {
       this.showFlag = !this.showFlag;
       this.Params = this.multipleSelection3[0]
     },
-    deleteData () {
+    deleteData() {
       let _this = this;
-        if (_this.multipleSelection3.length < 1) {
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要停用的数据！')
         return
       }
       let tempArr = []
-      this.multipleSelection3.map(item =>{
+      this.multipleSelection3.map(item => {
         tempArr.push(item.id)
       })
-      _this.axios.post('pass/testManagement/v1/limstestplans/disable', tempArr, {individualType: 'json'}).then(res => {
+      _this.axios.post('pass/testManagement/v1/limstestplans/disable', tempArr, { individualType: 'json' }).then(res => {
         if (res.succeed) {
           _this.dialogTableVisible = false;
           this.$message.success('停用操作成功');
           _this.refresh()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
+      }).catch(e => {
+        this.$message.error(e.message)
       })
     },
-    recoverData () {
+    recoverData() {
       let _this = this;
       if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要启用的数据！')
         return
       }
       let tempArr = []
-      this.multipleSelection3.map(item =>{
+      this.multipleSelection3.map(item => {
         tempArr.push(item.id)
       })
-      _this.axios.post('pass/testManagement/v1/limstestplans/enabled', tempArr, {individualType: 'json'}).then(res => {
+      _this.axios.post('pass/testManagement/v1/limstestplans/enabled', tempArr, { individualType: 'json' }).then(res => {
         if (res.succeed) {
           this.dialogTableVisible = false;
           this.$message.success('启用成功');
           _this.refresh()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
-       })
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    submitData () {
+    submitData() {
       if (this.multipleSelection3.length < 1) {
-      this.$message.warning('请勾选您要提交的数据！')
-      return
+        this.$message.warning('请勾选您要提交的数据！')
+        return
       }
-      for(let item of this.multipleSelection3){
+      for (let item of this.multipleSelection3) {
         if (item.stateFlag != 0) {
           this.$message.warning('数据不是编辑状态，不可提交！')
           return
@@ -363,23 +426,23 @@ export default {
           return
         }
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/check', this.multipleSelection3, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/check', this.multipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('提交成功');
-         this.refresh()
+          this.$message.success('提交成功');
+          this.refresh()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
-       })
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    returnSubmit () {//取消提交
+    returnSubmit() {//取消提交
       if (this.multipleSelection3.length < 1) {
-      this.$message.warning('请勾选您要取消提交的数据！')
-      return
+        this.$message.warning('请勾选您要取消提交的数据！')
+        return
       }
-      for(let item of this.multipleSelection3){
+      for (let item of this.multipleSelection3) {
         if (item.stateFlag != 4) {
           this.$message.warning('数据不是待审核状态，不可取消提交！')
           return
@@ -389,71 +452,71 @@ export default {
           return
         }
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/returnSubmit', this.multipleSelection3, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/returnSubmit', this.multipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('提交成功');
-         this.refresh()
+          this.$message.success('提交成功');
+          this.refresh()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
-        }).catch(e => {
-         this.$message.error(e.message)
-       })
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    checkData () {//审核
+    checkData() {//审核
       if (this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要审核的数据！')
         return
       }
       let flag = false;
-      this.multipleSelection3.forEach(item =>{
+      this.multipleSelection3.forEach(item => {
         if (item.stateFlag != 4) {
           this.$message.warning('请勾选状态为待审核的数据')
           flag = true
         }
       })
-      if (flag){
+      if (flag) {
         return
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/checkInterPlan', this.multipleSelection3, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/checkInterPlan', this.multipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('审核成功');
-         this.searchData()
+          this.$message.success('审核成功');
+          this.searchData()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
       }).catch(e => {
         this.$message.error(e.message)
       })
     },
-    uncheckData () {//取消审核
-       let _this = this;
-        if (_this.multipleSelection3.length < 1) {
+    uncheckData() {//取消审核
+      let _this = this;
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要取消审核的数据！')
         return
-        } else {
-          for (var j = 0; j < _this.multipleSelection3.length; j++) {
+      } else {
+        for (var j = 0; j < _this.multipleSelection3.length; j++) {
           if (_this.multipleSelection3[j].stateFlag != '1') {
-          this.$message.warning('请勾选状态为审核的数据')
-          return
+            this.$message.warning('请勾选状态为审核的数据')
+            return
           }
         }
-        _this.axios.post('pass/testManagement/v1/limstestplans/uncheck', _this.multipleSelection3, {individualType: 'json'}).then(res => {
-        if (res.succeed) {
-         this.$message.success('取消成功');
-         _this.searchData()
-        } else {
-         this.$message.error(res.message)
-        }
+        _this.axios.post('pass/testManagement/v1/limstestplans/uncheck', _this.multipleSelection3, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.$message.success('取消成功');
+            _this.searchData()
+          } else {
+            this.$message.error(res.message)
+          }
         }).catch(e => {
-         this.$message.error(e.message)
-       })
+          this.$message.error(e.message)
+        })
       }
     },
-    addData2 () {
-      if (JSON.stringify(this.saveRow)==="{}") {
-       this.$message.warning('请点击选中一条固定计划信息数据！')
-       return
+    addData2() {
+      if (JSON.stringify(this.saveRow) === "{}") {
+        this.$message.warning('请点击选中一条固定计划信息数据！')
+        return
       }
       if (this.saveRow.stateFlag == 2) {
         this.$message.warning('数据已提交，不可再新增')
@@ -463,9 +526,9 @@ export default {
       this.Params2 = null;
       this.Params = this.saveRow
     },
-    modifyData2 () {
+    modifyData2() {
       let _this = this;
-      if (JSON.stringify(this.planSave)==="{}") {
+      if (JSON.stringify(this.planSave) === "{}") {
         this.$message.warning('请点击选中一条需要修改的数据')
         return
       }
@@ -473,45 +536,45 @@ export default {
         this.$message.warning('数据已提交，不可再修改')
         return
       }
-      this.baseData = Object.assign({},this.planSave)
+      this.baseData = Object.assign({}, this.planSave)
       this.fxdialogTableVisible = true
     },
-    fxcloseDialog(){
+    fxcloseDialog() {
       this.fxdialogTableVisible = false
       this.baseData = {}
     },
-    fxaddData(){
-      this.axios.post('pass/testManagement/v1/limstestplands/saveLimsTestPlanD', this.baseData, {individualType: 'json'}).then(res => {
+    fxaddData() {
+      this.axios.post('pass/testManagement/v1/limstestplands/saveLimsTestPlanD', this.baseData, { individualType: 'json' }).then(res => {
         if (res.succeed) {
           this.fxdialogTableVisible = false;
           this.$message.success(res.message)
           this.depData(this.saveRow.planId)
         } else {
           this.$message.error(res.message)
-         }
-         }).catch(e => {
-          this.$message.error(e.message)
-        })
+        }
+      }).catch(e => {
+        this.$message.error(e.message)
+      })
     },
-    copyData2 () {
-       let _this = this;
-     if (_this.multipleSelection4.length < 1) {
+    copyData2() {
+      let _this = this;
+      if (_this.multipleSelection4.length < 1) {
         this.$message.warning('请勾选您要复制的数据！')
       } else {
-         _this.axios.post('pass/testManagement/v1/limstestplands/', _this.multipleSelection4, {individualType: 'json'}).then(res => {
-           if (res.succeed) {
+        _this.axios.post('pass/testManagement/v1/limstestplands/', _this.multipleSelection4, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
             this.$message.success('复制成功')
             _this.refresh2()
-           } else {
+          } else {
             this.$message.error(res.message)
-           }
-           }).catch(e => {
-            this.$message.error(e.message)
-          })
+          }
+        }).catch(e => {
+          this.$message.error(e.message)
+        })
       }
     },
-    deleteData2 () {
-      if (JSON.stringify(this.planSave)==="{}") {
+    deleteData2() {
+      if (JSON.stringify(this.planSave) === "{}") {
         this.$message.warning('请点击选中一条需要删除的数据')
         return
       }
@@ -520,28 +583,28 @@ export default {
         return
       }
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.axios.post('pass/testManagement/v1/limstestplands/deleteLimsTestPlanD?id='+this.planSave.id, {individualType: 'json'}).then(res => {
-            if (res.succeed) {
-              this.$message.success('删除操作成功');
-              this.depData(this.saveRow.planId)
-            } else {
-             this.$message.error(res.message)
-            }
-          }).catch(e => {
-            this.$message.error(e.message)
-          })
-        }).catch(() => {});
-    },
-    searchData () {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.axios.post('pass/testManagement/v1/limstestplands/deleteLimsTestPlanD?id=' + this.planSave.id, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.$message.success('删除操作成功');
+            this.depData(this.saveRow.planId)
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch(e => {
+          this.$message.error(e.message)
+        })
+      }).catch(() => { });
+    },
+    searchData() {
       this.page.pageNum = 1;
       this.page.pageSize = 200
       this.mainData()
     },
-    mainData(){
+    mainData() {
       this.saveRow = {}
       this.table.list2 = []
       if (!this.search.planDate) {
@@ -553,20 +616,20 @@ export default {
       }
       this.dataLoading = true;
       let obj = {
-        object:{
-          companyNo:this.search.companyNo,
-          planTypeCode:481702
+        object: {
+          companyNo: this.search.companyNo,
+          planTypeCode: 481702
         },
-        list:[0,4,1],
-        startTime: this.startTime ,
-        endTime:this.endTime ,
-        pageIndex:this.page.pageNum,
-        pageSize:this.page.pageSize
+        list: [0, 4, 1],
+        startTime: this.startTime,
+        endTime: this.endTime,
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/queryLimsTestPlanPage', obj, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/queryLimsTestPlanPage', obj, { individualType: 'json' }).then(res => {
         this.dataLoading = false;
         this.table.list = res.data.list;
-        this.table.list.forEach(item =>{
+        this.table.list.forEach(item => {
           item.validFlag1 = item.validFlag == '0' ? '无效' : item.validFlag == '1' ? '有效' : ''
           item.stateFlag1 = item.stateFlag == '0' ? '编辑' : item.stateFlag == '1' ? '已审核' : item.stateFlag == '4' ? '待审核' : ''
           item.isSmp1 = item.isSmp == '0' ? '否' : item.isSmp == '1' ? '是' : ''
@@ -579,7 +642,7 @@ export default {
           this.searchFollow(this.table.list[0])
         }
       }).catch(e => {
-          this.dataLoading = false;
+        this.dataLoading = false;
       });
     },
     searchFollow(row) {
@@ -592,10 +655,10 @@ export default {
       this.planSave = {}
       this.dataLoading2 = true
       let planIds = planId ? planId : ''
-      this.axios.post('pass/testManagement/v1/limstestplands/queryLimsTestPlanDByPlanId?planId='+planIds, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplands/queryLimsTestPlanDByPlanId?planId=' + planIds, { individualType: 'json' }).then(res => {
         this.dataLoading2 = false;
         this.table.list2 = res.data;
-        this.table.list2.forEach(item =>{
+        this.table.list2.forEach(item => {
           item.validFlag = item.validFlag == '0' ? '无效' : item.validFlag == '1' ? '有效' : ''
         })
         this.page2.totalPage = res.data.total;
@@ -603,98 +666,97 @@ export default {
         this.dataLoading2 = false;
       });
     },
-    reset () {
-      this.search.planDate=  [this.getYNM(new Date()), this.getYNM(new Date())]
+    reset() {
+      this.search.planDate = [this.getYNM(new Date()), this.getYNM(new Date())]
       this.search.companyNo = '';
       this.searchData();
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.multipleSelection3 = val;
     },
     pageSizeChange(size) {
       this.page.pageSize = size;
       this.mainData();
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.page.pageNum = index;
       this.mainData();
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.multipleSelection4 = val;
     },
-    pageSizeChange2 (size) {
+    pageSizeChange2(size) {
       this.page2.pageSize = size;
     },
-    pageCurrentChange2 (index) {
+    pageCurrentChange2(index) {
       this.page2.pageNum = index;
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
-    },
-    addScreen2 () {
-     this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
-    },
-    tableRowClassName({row, rowIndex}) {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
+    },
+    addScreen2() {
+      this.$nextTick(() => {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
       return '';
     },
-    tableCellClassName ({
-        row, column, rowIndex, columnIndex
-      }) {
-        // if (columnIndex === 24) {
-        // if (row.validFlag !== '1') {
-        //   return 'error-row';
-        // }
-        // }
-        if (columnIndex === 2) {
+    tableCellClassName({
+      row, column, rowIndex, columnIndex
+    }) {
+      // if (columnIndex === 24) {
+      // if (row.validFlag !== '1') {
+      //   return 'error-row';
+      // }
+      // }
+      if (columnIndex === 2) {
         if (row.stateFlag === '2') {
           return 'error-green';
         }
         return '';
-        }
-      },
-    tableRowClassName2 ({
-        row, column, rowIndex, columnIndex
-      }) {
-        // if (columnIndex === 6) {
-        // if (row.validFlag !== '1') {
-        //   return 'error-row';
-        // }
-        // return '';
-        // }
-        // if (columnIndex === 10 || columnIndex === 9) {
-        //   return 'erroe-bule2'
-        // }
-        // if (columnIndex === 12) {
-        // if (Date.parse(row.startTime) > new Date ()) {
-        //   return 'error-green2';
-        // }
-        // return '';
-        // }
-        // if (columnIndex === 13) {
-        // if (Date.parse(row.endTime) < new Date ()) {
-        //   return 'error-yellow2';
-        // }
-        // return '';
-        // }
-      },
-    tableHeaderCellStyle () {
+      }
+    },
+    tableRowClassName2({
+      row, column, rowIndex, columnIndex
+    }) {
+      // if (columnIndex === 6) {
+      // if (row.validFlag !== '1') {
+      //   return 'error-row';
+      // }
+      // return '';
+      // }
+      // if (columnIndex === 10 || columnIndex === 9) {
+      //   return 'erroe-bule2'
+      // }
+      // if (columnIndex === 12) {
+      // if (Date.parse(row.startTime) > new Date ()) {
+      //   return 'error-green2';
+      // }
+      // return '';
+      // }
+      // if (columnIndex === 13) {
+      // if (Date.parse(row.endTime) < new Date ()) {
+      //   return 'error-yellow2';
+      // }
+      // return '';
+      // }
+    },
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style  scoped>
-</style>
+<style scoped></style>

src/views/programManagement/components/interimPlanReview/interimPlanReview.vue

@@ -9,7 +9,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label='计划日期'>
-          <el-date-picker
+          <el-date-picker v-model="search.planDate[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 150px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.planDate[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 150px">
+          </el-date-picker>
+          <!-- <el-date-picker
          v-model="search.planDate"
          type="daterange"
          range-separator="至"
@@ -18,7 +25,7 @@
          size="small"
          format="yyyy-MM-dd"
          value-format="yyyy-MM-dd">
-        </el-date-picker>
+        </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -32,55 +39,80 @@
         临时计划信息表
       </div>
       <div>
-      <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="addData">新增</el-button>
+        <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="addData">新增</el-button>
       <el-button icon="el-icon-edit" type="goon" size="mini" @click="modifyData">修改</el-button>
       <el-button icon="el-icon-remove-outline" type="danger" size="mini" @click="deleteData">删除</el-button> -->
-      <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'audit'" @click="checkData">审核</el-button>
-      <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'cancel'" @click="uncheckData">取消</el-button>
+        <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'audit'"
+          @click="checkData">审核</el-button>
+        <el-button icon="el-icon-remove-outline" type="danger" size="mini" v-privilege="activeMenu + 'cancel'"
+          @click="uncheckData">取消</el-button>
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-       <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top" highlight-current-row @selection-change="handleSelectionChange" :data="table.list" :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName" @row-click="searchFollow" :summary-method="getSummaries" show-summary>
+      <el-table id="excelTable" v-loading="dataLoading" ref="dataTable" border :height="height_top"
+        highlight-current-row @selection-change="handleSelectionChange" :data="table.list"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+        :cell-class-name="tableRowClassName" @row-click="searchFollow" :summary-method="getSummaries" show-summary>
         <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
-        <el-table-column type="selection" width="55"  fixed="left" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stateFlag1" label="状态" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planDate1" label="计划日期" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planCompanyName" label="计划单位" align="center"></el-table-column>
+        <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stateFlag1" label="状态"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="planDate1" label="计划日期"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="entrTypeName" label="委托类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planCompanyName" label="计划单位"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="140px" prop="deptName" label="计划车间" align="center"></el-table-column> -->
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="sampleTypeName" label="样品类型" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matName" label="物料名称" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="sampleTypeName" label="样品类型"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="matName" label="物料名称"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="140px" prop="planDate1" label="计划日期" align="center"></el-table-column> -->
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="companyName" label="检验单位"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="deptName" label="检验车间"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sectionName" label="检验班组"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpCompanyName" label="取样单位"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeptName" label="取样车间"  align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpSectionName" label="取样班组"  align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="200px" prop="pointName" label="取样地点"  align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testLimit" label="测试时限(小时)"  align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="isSmp1" label="是否取样"  align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="isBatch1" label="是否组批"  align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="companyName" label="检验单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="deptName" label="检验车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="sectionName" label="检验班组"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpCompanyName" label="取样单位"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpDeptName" label="取样车间"
+          align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable min-width="120px" prop="smpSectionName" label="取样班组"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="200px" prop="pointName" label="取样地点"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testLimit" label="测试时限(小时)"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="isSmp1" label="是否取样"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="isBatch1" label="是否组批"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="100px" prop="testTime1" label="测试起始时间" align="center"></el-table-column>
         <el-table-column sortable width="130px" prop="durTime" label="间隔时间（小时）" align="center"></el-table-column> -->
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="90px"  prop="validFlag1" label="数据状态" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="90px" prop="validFlag1" label="数据状态"
+          align="center"></el-table-column>
         <!-- <el-table-column sortable width="90px"  prop="validFlag1" label="状态" align="center"></el-table-column> -->
-          <!-- <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
               <span v-if="scope.row.validFlag == 1">已启用</span>
               <span v-else-if="scope.row.validFlag == 0">已停用</span>
           </template> -->
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="200px" prop="memo" label="备注" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="200px" prop="memo" label="备注"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+          align="center"></el-table-column>
       </el-table>
     </div>
     <div class="common-foot-style">
-        <el-pagination  @size-change="pageSizeChange" @current-change="pageCurrentChange"
-          :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-          :total="page.totalPage" background>
-        </el-pagination>
+      <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="page.pageNum"
+        :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+      </el-pagination>
     </div>
     <div class="common-title-div">
       <div class="common-title-name">
@@ -88,30 +120,40 @@
         计划检验项目表
       </div>
       <div>
-      <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="addData2">新增</el-button> -->
-      <!-- <el-button icon="el-icon-edit" type="goon" size="mini" @click="modifyData2">修改</el-button> -->
-      <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="copyData2">复制</el-button> -->
-      <!-- <el-button icon="el-icon-remove-outline" type="danger" size="mini" @click="deleteData2">停用</el-button> -->
-      <!-- <el-button icon="el-icon-check" type="goon" size="mini" @click="checkData2">启用</el-button> -->
+        <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="addData2">新增</el-button> -->
+        <!-- <el-button icon="el-icon-edit" type="goon" size="mini" @click="modifyData2">修改</el-button> -->
+        <!-- <el-button icon="el-icon-circle-plus-outline" type="goon" size="mini" @click="copyData2">复制</el-button> -->
+        <!-- <el-button icon="el-icon-remove-outline" type="danger" size="mini" @click="deleteData2">停用</el-button> -->
+        <!-- <el-button icon="el-icon-check" type="goon" size="mini" @click="checkData2">启用</el-button> -->
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-       <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" highlight-current-row @selection-change="handleSelectionChange2" :data="table.list2.slice((this.page2.pageNum -1)*this.page2.pageSize,this.page2.pageNum*this.page2.pageSize)" :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
+      <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" highlight-current-row
+        @selection-change="handleSelectionChange2"
+        :data="table.list2.slice((this.page2.pageNum - 1) * this.page2.pageSize, this.page2.pageNum * this.page2.pageSize)"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+        :cell-class-name="tableRowClassName2" :summary-method="getSummaries" show-summary>
         <el-table-column type="index" label="NO" fixed="left" align="center">
         </el-table-column>
         <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planIdD" label="计划单子号" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planId" label="计划单号" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="testItemName" label="任务名称" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="anlyItemName" label="分析项目" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="90px"  prop="validFlag1" label="数据状态" align="center"></el-table-column>
-          <!-- <template slot-scope="scope">
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planIdD" label="计划单子号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="planId" label="计划单号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="testItemName" label="任务名称"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="anlyItemName" label="分析项目"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="90px" prop="validFlag1" label="数据状态"
+          align="center"></el-table-column>
+        <!-- <template slot-scope="scope">
               <span v-if="scope.row.validFlag == 1">已启用</span>
               <span v-else-if="scope.row.validFlag == 0">已停用</span>
           </template> -->
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="memo" label="备注" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="memo" label="备注"
+          align="center"></el-table-column>
       </el-table>
     </div>
     <!-- <div class="common-foot-style">
@@ -134,7 +176,7 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  data () {
+  data() {
     return {
       table: {
         list: [],
@@ -162,23 +204,23 @@ export default {
       sampleTypeNameType: [],
       multipleSelection3: [],
       multipleSelection4: [],
-      height_top:0,
-      height_bot:0,
+      height_top: 0,
+      height_bot: 0,
       search: {
         planDate: [],
         companyName: ''
       },
-      activeMenu:''
+      activeMenu: ''
     }
   },
   created() {
     this.height_top = window.innerHeight / 2 - 130 < 249 ? 249 : window.innerHeight / 2 - 110;
     this.height_bot = window.innerHeight / 2 - 130 < 249 ? 249 : window.innerHeight / 2 - 110;
-    this.search.planDate=  [this.getYNM(new Date()), this.getYNM(new Date())] 
+    this.search.planDate = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
   },
-  mounted () {
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{}, {individualType: 'json'}).then(response => {
+  mounted() {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: 'json' }).then(response => {
       this.companyNameType = response.data
     });
     this.searchData();
@@ -203,17 +245,17 @@ export default {
         }
         if (index === 1) {
           sums[index] = data.length;
-        } 
+        }
       });
-      return sums;   
+      return sums;
     },
-    checkData () {
+    checkData() {
       if (this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要审核的数据！')
         return
       }
       let flag = false
-      this.multipleSelection3.forEach(item =>{
+      this.multipleSelection3.forEach(item => {
         if (item.stateFlag == 1) {
           this.$message.warning('请勾选状态为未审的数据')
           flag = true
@@ -223,46 +265,46 @@ export default {
       if (flag) {
         return
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/submit', this.multipleSelection3, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/submit', this.multipleSelection3, { individualType: 'json' }).then(res => {
         if (res.succeed) {
-         this.$message.success('审核成功');
-         this.searchData()
+          this.$message.success('审核成功');
+          this.searchData()
         } else {
-         this.$message.error(res.message)
+          this.$message.error(res.message)
         }
       }).catch(e => {
         this.$message.error(e.message)
       })
     },
-    uncheckData () {
-       let _this = this;
-        if (_this.multipleSelection3.length < 1) {
+    uncheckData() {
+      let _this = this;
+      if (_this.multipleSelection3.length < 1) {
         this.$message.warning('请勾选您要取消审核的数据！')
-        } else {
-          for (var j = 0; j < _this.multipleSelection3.length; j++) {
+      } else {
+        for (var j = 0; j < _this.multipleSelection3.length; j++) {
           if (_this.multipleSelection3[j].stateFlag === '2') {
-          this.$message.warning('请勾选状态为审核的数据')
-          return
+            this.$message.warning('请勾选状态为审核的数据')
+            return
           }
         }
-        _this.axios.post('pass/testManagement/v1/limstestplans/uncheck', _this.multipleSelection3, {individualType: 'json'}).then(res => {
-        if (res.succeed) {
-         this.$message.success('取消成功');
-         _this.searchData()
-        } else {
-         this.$message.error(res.message)
-        }
+        _this.axios.post('pass/testManagement/v1/limstestplans/uncheck', _this.multipleSelection3, { individualType: 'json' }).then(res => {
+          if (res.succeed) {
+            this.$message.success('取消成功');
+            _this.searchData()
+          } else {
+            this.$message.error(res.message)
+          }
         }).catch(e => {
-         this.$message.error(e.message)
-       })
+          this.$message.error(e.message)
+        })
       }
     },
-    searchData(){
+    searchData() {
       this.page.pageNum = 1
       this.page.pageSize = 200
       this.mainData()
     },
-    mainData () {
+    mainData() {
       this.dataLoading = true;
       if (!this.search.planDate) {
         this.startTime = ''
@@ -272,27 +314,27 @@ export default {
         this.endTime = this.search.planDate[1] + ' 23:59:59'
       }
       let obj = {
-        object:{
-          companyNo:this.search.companyNo,
-          planTypeCode:481702
+        object: {
+          companyNo: this.search.companyNo,
+          planTypeCode: 481702
         },
-        list:[1,2],
-        startTime: this.startTime ,
-        endTime:this.endTime ,
-        pageIndex:this.page.pageNum,
-        pageSize:this.page.pageSize
+        list: [1, 2],
+        startTime: this.startTime,
+        endTime: this.endTime,
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize
       }
-      this.axios.post('pass/testManagement/v1/limstestplans/queryLimsTestPlanPage', obj, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplans/queryLimsTestPlanPage', obj, { individualType: 'json' }).then(res => {
         this.dataLoading = false;
         let data = [];
         this.table.list = []
         data = res.data.list;
-        data.forEach(item =>{
+        data.forEach(item => {
           if (item.validFlag != 0) {
             this.table.list.push(item)
-          }  
+          }
         })
-        this.table.list.forEach(item =>{
+        this.table.list.forEach(item => {
           item.validFlag1 = item.validFlag == 0 ? '无效' : item.validFlag == 1 ? '有效' : ''
           item.stateFlag1 = item.stateFlag == 2 ? '未审' : item.stateFlag == 1 ? '审核' : ''
           item.isSmp1 = item.isSmp == 0 ? '否' : item.isSmp == 1 ? '是' : ''
@@ -315,14 +357,14 @@ export default {
       this.page2.pageSize = 50
       this.depData(this.planId)
     },
-    depData(planId){
-     this.planSave = {}
+    depData(planId) {
+      this.planSave = {}
       this.dataLoading2 = true
       let planIds = planId ? planId : ''
-      this.axios.post('pass/testManagement/v1/limstestplands/queryLimsTestPlanDByPlanId?planId='+planIds, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstestplands/queryLimsTestPlanDByPlanId?planId=' + planIds, { individualType: 'json' }).then(res => {
         this.dataLoading2 = false;
         this.table.list2 = res.data;
-        this.table.list2.forEach(item =>{
+        this.table.list2.forEach(item => {
           item.validFlag1 = item.validFlag == '0' ? '无效' : item.validFlag == '1' ? '有效' : ''
         })
         this.page2.totalPage = res.data.total;
@@ -330,92 +372,91 @@ export default {
         this.dataLoading2 = false;
       });
     },
-    reset () {
-      this.search.planDate = [this.getYNM(new Date()), this.getYNM(new Date())] ;
+    reset() {
+      this.search.planDate = [this.getYNM(new Date()), this.getYNM(new Date())];
       this.search.companyNo = '';
       this.searchData();
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.multipleSelection3 = val;
     },
-    pageSizeChange (size) {
+    pageSizeChange(size) {
       this.page.pageSize = size;
       this.mainData();
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.page.pageNum = index;
       this.mainData();
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.multipleSelection4 = val;
     },
-    pageSizeChange2 (size) {
+    pageSizeChange2(size) {
       this.page2.pageSize = size;
     },
-    pageCurrentChange2 (index) {
+    pageCurrentChange2(index) {
       this.page2.pageNum = index;
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    addScreen2 () {
-     this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+    addScreen2() {
+      this.$nextTick(() => {
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-   tableRowClassName ({
-        row, column, rowIndex, columnIndex
-      }) {
-        if (columnIndex === 19) {
+    tableRowClassName({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 19) {
         if (row.validFlag !== '1') {
           return 'error-row';
         }
-        }
-        if (columnIndex === 2) {
+      }
+      if (columnIndex === 2) {
         if (row.stateFlag === '1') {
           return 'error-green';
         }
         return '';
-        }
-      },
-    tableRowClassName2 ({
-        row, column, rowIndex, columnIndex
-      }) {
-        if (columnIndex === 7) {
+      }
+    },
+    tableRowClassName2({
+      row, column, rowIndex, columnIndex
+    }) {
+      if (columnIndex === 7) {
         if (row.validFlag !== '1') {
           return 'error-row';
         }
         return '';
-        }
-        // if (columnIndex === 10 || columnIndex === 9) {
-        //   return 'erroe-bule2'
-        // } 
-        // if (columnIndex === 12) {
-        // if (Date.parse(row.startTime) > new Date ()) {
-        //   return 'error-green2';
-        // } 
-        // return '';
-        // }
-        // if (columnIndex === 13) {
-        // if (Date.parse(row.endTime) < new Date ()) {
-        //   return 'error-yellow2';
-        // } 
-        // return '';
-        // }
-      },
-    tableHeaderCellStyle () {
+      }
+      // if (columnIndex === 10 || columnIndex === 9) {
+      //   return 'erroe-bule2'
+      // }
+      // if (columnIndex === 12) {
+      // if (Date.parse(row.startTime) > new Date ()) {
+      //   return 'error-green2';
+      // }
+      // return '';
+      // }
+      // if (columnIndex === 13) {
+      // if (Date.parse(row.endTime) < new Date ()) {
+      //   return 'error-yellow2';
+      // }
+      // return '';
+      // }
+    },
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style  scoped>
-</style>
+<style scoped></style>

src/views/reportForm/components/chemicalAnalysisReport.vue

@@ -3,79 +3,38 @@
     <div class="common-head-search">
       <el-form :inline="true">
         <el-form-item label="样品类型">
-          <el-select
-            v-model="search.sampleTypeCode"
-            clearable
-            filterable
-            collapse-tags
-            size="small"
-            style="width: 150px"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in sampleTypeNameType"
-              :key="item.baseCode"
-              :label="item.baseName"
-              :value="item.baseCode"
-            >
+          <el-select v-model="search.sampleTypeCode" clearable filterable collapse-tags size="small"
+            style="width: 150px" placeholder="请选择">
+            <el-option v-for="item in sampleTypeNameType" :key="item.baseCode" :label="item.baseName"
+              :value="item.baseCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="样品名称">
-          <el-input
-            v-model="search.matName"
-            size="small"
-            placeholder="请输入样品名称"
-            style="width: 150px"
-          ></el-input>
+          <el-input v-model="search.matName" size="small" placeholder="请输入样品名称" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="中心编号">
-          <el-input
-            v-model="search.sampleNo"
-            size="small"
-            placeholder="请输入中心编号"
-            style="width: 150px"
-          ></el-input>
+          <el-input v-model="search.sampleNo" size="small" placeholder="请输入中心编号" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="委托编号">
-          <el-input
-            v-model="search.carNo"
-            size="small"
-            placeholder="请输入委托编号"
-            style="width: 150px"
-          ></el-input>
+          <el-input v-model="search.carNo" size="small" placeholder="请输入委托编号" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="委托日期">
-          <el-date-picker
-            v-model="search.stateTime"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            size="mini"
-            style="width: 200px"
-          >
+          <el-date-picker v-model="search.stateTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 150px">
           </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.stateTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 150px">
+          </el-date-picker>
+          <!-- <el-date-picker v-model="search.stateTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="daterange"
+            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini" style="width: 200px">
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            size="mini"
-            :loading="dataLoading"
-            @click="searchData1"
-            >查询</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            type="info"
-            plain
-            size="mini"
-            @click="reset"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" size="mini" :loading="dataLoading"
+            @click="searchData1">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -83,211 +42,82 @@
       <el-col :span="4">
         <div class="common-title-div">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../assets/img/imgScreen/logo.png" />
             <span style="font-size: 15px">物料名称</span>
           </div>
         </div>
         <div class="common-table-div">
-          <el-table
-            ref="tableMain11"
-            :height="singleTableHeight"
-            v-loading="tableLoading"
-            :data="table.list"
-            highlight-current-row
-            @row-click="handleCurrentChange"
-            :summary-method="getSummaries"
-            :header-cell-style="tableHeaderCellStyle"
-            show-summary
-            border
-            style="width: 100%"
-            :icorePanelShown="100"
-            :icore-filter-flag="icoreFilterFlag"
-          >
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              min-width="100"
-              prop="MAT_NAME"
-              label="物料名称"
-            ></el-table-column>
+          <el-table ref="tableMain11" :height="singleTableHeight" v-loading="tableLoading" :data="table.list"
+            highlight-current-row @row-click="handleCurrentChange" :summary-method="getSummaries"
+            :header-cell-style="tableHeaderCellStyle" show-summary border style="width: 100%" :icorePanelShown="100"
+            :icore-filter-flag="icoreFilterFlag">
+            <el-table-column sortable show-overflow-tooltip align="center" min-width="100" prop="MAT_NAME"
+              label="物料名称"></el-table-column>
           </el-table>
         </div>
       </el-col>
       <el-col :span="20">
         <div class="common-title-div">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../assets/img/imgScreen/logo.png" />
             台账信息
           </div>
           <div class="common-button-div">
-            <el-button
-              icon="el-icon-download"
-              type="goon"
-              size="mini"
-              :loading="tableExportLoading"
-              @click="maintenance"
-              >维护上下限</el-button
-            >
-            <el-button
-              icon="el-icon-download"
-              type="goon"
-              size="mini"
-              :loading="tableExportLoading"
-              @click="doExport"
-              >导出</el-button
-            >
+            <el-button icon="el-icon-download" type="goon" size="mini" :loading="tableExportLoading"
+              @click="maintenance">维护上下限</el-button>
+            <el-button icon="el-icon-download" type="goon" size="mini" :loading="tableExportLoading"
+              @click="doExport">导出</el-button>
           </div>
         </div>
         <div class="common-table-div" id="topTable">
-          <el-table
-            ref="el_table_1"
-            border
-            :height="singleTableHeight"
-            width="100%"
-            highlight-current-row
-            @selection-change="searchFollow"
-            :data="table.list1"
-          >
-            <el-table-column
-              type="selection"
-              width="55"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="160"
-              prop="CAR_NO"
-              label="委托编号"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="120"
-              prop="SAMPLE_NO"
-              label="中心编号"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="120"
-              prop="MAT_NAME"
-              label="物料名称"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="120"
-              prop="MEMO"
-              label="委托备注"
-            ></el-table-column>
-            <el-table-column
-              v-for="col in cols"
-              :prop="col.ANLY_ITEM_NO"
-              show-overflow-tooltip
-              align="center"
-              :key="col.ANLY_ITEM_NO"
-              :label="col.ANLY_ITEM_NAME"
-            >
+          <el-table ref="el_table_1" border :height="singleTableHeight" width="100%" highlight-current-row
+            @selection-change="searchFollow" :data="table.list1">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="160" prop="CAR_NO"
+              label="委托编号"></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="SAMPLE_NO"
+              label="中心编号"></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="MAT_NAME"
+              label="物料名称"></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="MEMO"
+              label="委托备注"></el-table-column>
+            <el-table-column v-for="col in cols" :prop="col.ANLY_ITEM_NO" show-overflow-tooltip align="center"
+              :key="col.ANLY_ITEM_NO" :label="col.ANLY_ITEM_NAME">
               <template slot-scope="scope">
                 <span :style="redStyle(scope.row.SA_ID, col.ANLY_ITEM_NO)">{{
                   scope.row[col.ANLY_ITEM_NO]
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="120"
-              prop="UPDATE_TIME"
-              label="开始时间"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              show-overflow-tooltip
-              align="center"
-              width="120"
-              prop="CREATE_TIME"
-              label="结束时间"
-            ></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="UPDATE_TIME"
+              label="开始时间"></el-table-column>
+            <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="CREATE_TIME"
+              label="结束时间"></el-table-column>
           </el-table>
         </div>
         <div class="common-foot-style">
-          <el-pagination
-            @size-change="pageSizeChange"
-            @current-change="pageCurrentChange"
-            :current-page="page.pageNum"
-            :page-sizes="[50, 100, 200, 500, 1000]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.totalPage"
-            background
-          >
+          <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="page.pageNum"
+            :page-sizes="[50, 100, 200, 500, 1000]" :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
           </el-pagination>
         </div>
       </el-col>
     </el-row>
-    <el-dialog
-      :close-on-click-modal="false"
-      @close="closebatch"
-      width="100%"
-      :visible.sync="recallShow"
-      top="0"
-    >
+    <el-dialog :close-on-click-modal="false" @close="closebatch" width="100%" :visible.sync="recallShow" top="0">
       <div slot="title" class="titleBox">
         <i class="el-icon-document" style="font-size: 20px"></i>
         <span style="margin-left: 10px; font-size: 18px">维护信息</span>
       </div>
       <div class="common-table-div">
-        <el-table
-          border
-          ref="dataTable123"
-          :data="recallList"
-          :height="theight2"
-          @selection-change="recallSelection"
-          highlight-current-row
-        >
-          <el-table-column
-            type="selection"
-            width="45"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            sortable
-            min-width="80"
-            align="center"
-            prop="ANLY_ITEM_NAME"
-            label="检测项目"
-          ></el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            sortable
-            min-width="80"
-            align="center"
-            prop="MIN_SIGN"
-            label="下限符号"
-          >
+        <el-table border ref="dataTable123" :data="recallList" :height="theight2" @selection-change="recallSelection"
+          highlight-current-row>
+          <el-table-column type="selection" width="45" align="center"></el-table-column>
+          <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="ANLY_ITEM_NAME"
+            label="检测项目"></el-table-column>
+          <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="MIN_SIGN" label="下限符号">
             <template slot-scope="scope">
-              <input
-                v-model="scope.row.MIN_SIGN"
-                size="small"
-                @keydown="keyDown($event, scope.row, scope.$index)"
-                :id="scope.column.id + '--' + scope.$index"
-                @change="inputDataPl($event, scope.$index)"
-                style="
+              <input v-model="scope.row.MIN_SIGN" size="small" @keydown="keyDown($event, scope.row, scope.$index)"
+                :id="scope.column.id + '--' + scope.$index" @change="inputDataPl($event, scope.$index)" style="
                   width: 100%;
                   height: 28px;
                   line-height: 28px;
@@ -295,27 +125,14 @@
                   padding-left: 3px;
                   text-align: center;
                   font-size: 15px;
-                "
-              />
+                " />
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            sortable
-            min-width="80"
-            align="center"
-            prop="MIN_VALUE"
-            label="下限值"
-          >
+          <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="MIN_VALUE" label="下限值">
             <template slot-scope="scope">
-              <input
-                v-model="scope.row.MIN_VALUE"
-                size="small"
-                @keydown="keyDown($event, scope.row, scope.$index)"
-                :id="scope.column.id + '--' + scope.$index"
-                @change="inputDataPl($event, scope.$index)"
-                oninput="value=value.replace(/[^0-9\[.\]{1}-]/g,'')"
-                style="
+              <input v-model="scope.row.MIN_VALUE" size="small" @keydown="keyDown($event, scope.row, scope.$index)"
+                :id="scope.column.id + '--' + scope.$index" @change="inputDataPl($event, scope.$index)"
+                oninput="value=value.replace(/[^0-9\[.\]{1}-]/g,'')" style="
                   width: 100%;
                   height: 28px;
                   line-height: 28px;
@@ -323,26 +140,13 @@
                   padding-left: 3px;
                   text-align: center;
                   font-size: 15px;
-                "
-              />
+                " />
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            sortable
-            min-width="80"
-            align="center"
-            prop="MAX_SIGN"
-            label="上限符号"
-          >
+          <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="MAX_SIGN" label="上限符号">
             <template slot-scope="scope">
-              <input
-                v-model="scope.row.MAX_SIGN"
-                size="small"
-                @keydown="keyDown($event, scope.row, scope.$index)"
-                :id="scope.column.id + '--' + scope.$index"
-                @change="inputDataPl($event, scope.$index)"
-                style="
+              <input v-model="scope.row.MAX_SIGN" size="small" @keydown="keyDown($event, scope.row, scope.$index)"
+                :id="scope.column.id + '--' + scope.$index" @change="inputDataPl($event, scope.$index)" style="
                   width: 100%;
                   height: 28px;
                   line-height: 28px;
@@ -350,27 +154,14 @@
                   padding-left: 3px;
                   text-align: center;
                   font-size: 15px;
-                "
-              />
+                " />
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            sortable
-            min-width="80"
-            align="center"
-            prop="MAX_VALUE"
-            label="上限值"
-          >
+          <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="MAX_VALUE" label="上限值">
             <template slot-scope="scope">
-              <input
-                v-model="scope.row.MAX_VALUE"
-                size="small"
-                @keydown="keyDown($event, scope.row, scope.$index)"
-                :id="scope.column.id + '--' + scope.$index"
-                @change="inputDataPl($event, scope.$index)"
-                oninput="value=value.replace(/[^0-9\[.\]{1}-]/g,'')"
-                style="
+              <input v-model="scope.row.MAX_VALUE" size="small" @keydown="keyDown($event, scope.row, scope.$index)"
+                :id="scope.column.id + '--' + scope.$index" @change="inputDataPl($event, scope.$index)"
+                oninput="value=value.replace(/[^0-9\[.\]{1}-]/g,'')" style="
                   width: 100%;
                   height: 28px;
                   line-height: 28px;
@@ -378,28 +169,15 @@
                   padding-left: 3px;
                   text-align: center;
                   font-size: 15px;
-                "
-              />
+                " />
             </template>
           </el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button
-          type="goon"
-          size="mini"
-          icon="el-icon-check"
-          :loading="batchLoading"
-          @click="determineList()"
-          >确认</el-button
-        >
-        <el-button
-          size="mini"
-          type="goon"
-          icon="el-icon-remove-outline"
-          @click="closebatch"
-          >取消</el-button
-        >
+        <el-button type="goon" size="mini" icon="el-icon-check" :loading="batchLoading"
+          @click="determineList()">确认</el-button>
+        <el-button size="mini" type="goon" icon="el-icon-remove-outline" @click="closebatch">取消</el-button>
       </span>
     </el-dialog>
   </div>
@@ -501,25 +279,29 @@ export default {
         startTime: startTime,
         endTime: endTime,
       };
-      this.dataLoading = true;
-      this.axios
-        .post(
-          "pass/baseManagement/v1/limssamplereleases/queryParameterMatName",
-          obj,
-          { individualType: "json" }
-        )
-        .then((res) => {
-          if (res.code == 0 || res.code == 200) {
-            this.table.list = res.data;
-          } else {
-            this.$message.error(res.message);
-          }
-          this.dataLoading = false;
-        })
-        .catch((err) => {
-          this.dataLoading = false;
-          this.$message.error(err.message);
-        });
+      if (this.tableList.MAT_NO != null) {
+        this.searchData()
+      } else {
+        this.dataLoading = true;
+        this.axios
+          .post(
+            "pass/baseManagement/v1/limssamplereleases/queryParameterMatName",
+            obj,
+            { individualType: "json" }
+          )
+          .then((res) => {
+            if (res.code == 0 || res.code == 200) {
+              this.table.list = res.data;
+            } else {
+              this.$message.error(res.message);
+            }
+            this.dataLoading = false;
+          })
+          .catch((err) => {
+            this.dataLoading = false;
+            this.$message.error(err.message);
+          });
+      }
     },
     searchData() {
       let startTime = "";
@@ -751,11 +533,16 @@ export default {
       this.searchData();
     },
     reset() {
-      this.search.matName = "";
+      this.search = {};
       let aaa = new Date();
       let bbb = new Date().getTime() - 60000 * 60 * 24 * 7;
       aaa.setTime(bbb);
       this.search.stateTime = [this.getYNM(aaa), this.getYNM(new Date())];
+      this.tableList = {}
+      this.table.list = []
+      this.table.list1 = []
+      this.searchData1();
+
     },
     getSummaries(param) {
       const { columns, data } = param;

src/views/samplePreparationTask/components/samplePreparationTaskRaw/samplePreparationTaskRaw.vue

@@ -13,7 +13,14 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="search.entrTime"
             type="daterange"
             range-separator="至"
@@ -23,7 +30,7 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button

src/views/standardManagement/components/internalAuditManagement/internalAuditManagement.vue

@@ -891,10 +891,10 @@ export default {
         this.$message.error("已提交的数据不能在次提交！")
         return
       }
-      // if(bg1){
-      //     this.$message.error("您不是这个岗位的，不可提交数据！")
-      //     return
-      // }
+      if (bg1) {
+        this.$message.error("您不是这个岗位的，不可提交数据！")
+        return
+      }
       this.submitLoading = true;
       this.axios.post("pass/baseManagement/v1/limsisodatads/submitLimsIsoDataD", this.multipleSelection1, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {

src/views/standardManagement/components/systemFileViewing/systemFileViewing.vue

@@ -6,11 +6,11 @@
         <el-form-item label="文件名称" label-width="65px">
           <el-input type="text" size="mini" v-model="searchForm.fileName" clearable></el-input>
         </el-form-item>
-        <el-form-item label="文件时间">
+        <!-- <el-form-item label="文件时间">
           <el-date-picker v-model="searchForm.time" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" size="small" style="width: 300px" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label-width="0">
           <el-button type="primary" size="mini" @click="fileDataSearch">查询</el-button>
           <el-button type="primary" size="mini">重置</el-button>
@@ -30,8 +30,8 @@
             :style="{ height: treeHeight + 'px' }">
             <span class="custom-tree-node" slot-scope="{ node, data }">
               <span :style="data.status === '0' || node.parent.data.status === '0'
-                  ? 'color: #a09e9e;'
-                  : ''
+                ? 'color: #a09e9e;'
+                : ''
                 ">{{ node.label }}</span>
               <!-- <span class="nodeOperate contextmenu">
                 <el-dropdown @command="handleCommand" :hide-on-click="false">
@@ -85,30 +85,12 @@
             align="center"></el-table-column>
           <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="filePath01" label="附件"
             align="center"></el-table-column>
-          <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="filePath" label="模板文件"
-            align="center"><template slot-scope="scope">
-              <el-tooltip content="下载" placement="bottom" effect="light">
-                <el-button :disabled="!scope.row.memo3" type="goon" size="mini" icon="el-icon-download" circle @click="
-                  imgPreView(
-                    scope.row,
-                    scope.row.memo3
-                  )
-                  ">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip content="预览" placement="bottom" effect="light">
-                <el-button :disabled='!scope.row.memo3' type="warning" size="mini" icon="el-icon-view" circle
-                  @click="imgPreViewY(scope.row, scope.row.memo3)">
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="filePath01" label="内容文件"
+          <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="filePath01" label="下载/预览"
             align="center"><template slot-scope="scope">
               <el-tooltip content="下载" placement="bottom" effect="light">
                 <el-button :disabled="!scope.row.filePath01" type="goon" size="mini" icon="el-icon-download" circle
                   @click="
-                    imgPreView(
+                    imgPreViewAll(
                       scope.row,
                       scope.row.filePath01
                     )
@@ -117,7 +99,7 @@
               </el-tooltip>
               <el-tooltip content="预览" placement="bottom" effect="light">
                 <el-button :disabled='!scope.row.filePath01' type="warning" size="mini" icon="el-icon-view" circle
-                  @click="imgPreViewY(scope.row, scope.row.filePath01)">
+                  @click="imgPreViewYAll(scope.row, scope.row.filePath01)">
                 </el-button>
               </el-tooltip>
             </template>
@@ -199,7 +181,7 @@ export default {
   created() {
     this.treeHeight = window.innerHeight - 200
     this.tableHeight = window.innerHeight - 110
-    this.searchForm.time = [this.getYNM(new Date()), this.getYNM(new Date())]
+    // this.searchForm.time = [this.getYNM(new Date()) , this.getYNM(new Date())]
     this.init()
   },
   mounted() {
@@ -241,13 +223,13 @@ export default {
       }
       let startTime = ''
       let endTime = ''
-      if (!this.searchForm.time) {
-        startTime = ''
-        endTime = ''
-      } else {
-        startTime = formatDate(this.searchForm.time[0], "yyyy-MM-dd") + ' 00:00:00'
-        endTime = formatDate(this.searchForm.time[1], "yyyy-MM-dd") + ' 23:59:59'
-      }
+      // if (!this.searchForm.time) {
+      //   startTime = ''
+      //   endTime = ''
+      // } else {
+      //   startTime = formatDate(this.searchForm.time[0], "yyyy-MM-dd") + ' 00:00:00'
+      //   endTime = formatDate(this.searchForm.time[1], "yyyy-MM-dd") + ' 23:59:59'
+      // }
       let param = {
         ...this.recordPage,
         classNo: classNo,
@@ -364,6 +346,22 @@ export default {
         return this.$message.error(e.message)
       })
     },
+    imgPreViewAll(row, fileName) {
+      this.axios.get('pass/baseManagement/v1/file/downloadAll?coverFileName=' + row.memo3 + "&contentFileName=" + row.filePath01, { responseType: 'blob' }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } }).then(res => {
+        let blob = new Blob([res]);
+        let elink = document.createElement('a');
+        elink.download = fileName;
+        elink.style.display = 'none';
+        elink.target = "_blank";
+        elink.href = URL.createObjectURL(blob);
+        document.body.appendChild(elink);
+        elink.click();
+        URL.revokeObjectURL(elink.href); // 释放URL对象
+        document.body.removeChild(elink);
+      }).catch(e => {
+        return this.$message.error(e.message)
+      })
+    },
     imgPreViewY(row, fileName) {
       let aaa = fileName.substr(fileName.indexOf(".") + 1);
       if (aaa == "docx") {
@@ -396,6 +394,38 @@ export default {
         return this.$message.error("不支持这个类型的文件展示！")
       }
     },
+    imgPreViewYAll(row, fileName) {
+      let aaa = fileName.substr(fileName.indexOf(".") + 1);
+      if (aaa == "docx") {
+        this.axios.get('pass/baseManagement/v1/file/downloadAll?coverFileName=' + row.memo3 + "&contentFileName=" + row.filePath01, { responseType: 'blob' }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } }).then(res => {
+          this.showFlag(true);
+          docx.renderAsync(res, this.$refs.file)
+        }).catch(e => {
+          return this.$message.error(e.message)
+        })
+      } else if (aaa == "pdf") {
+        this.axios.get('pass/baseManagement/v1/file/downloadAll?coverFileName=' + row.memo3 + "&contentFileName=" + row.filePath01, { responseType: 'blob' }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } }).then(res => {
+          const binaryData = [];
+          binaryData.push(res);
+          this.srcUrl = window.URL.createObjectURL(new Blob(binaryData, { type: 'application/pdf' }))
+          window.open(this.srcUrl);
+        }).catch(e => {
+          return this.$message.error(e.message)
+        })
+      } else if (aaa == "xlsx") {
+        this.axios.get('pass/baseManagement/v1/file/downloadAll?coverFileName=' + row.memo3 + "&contentFileName=" + row.filePath01, { responseType: 'arraybuffer' }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } }).then(res => {
+          this.excelSheet = [];
+          this.showFlag(false);
+          let workbook = XLSX.read(new Uint8Array(res), { type: "array" });
+          this.tableToHtml(workbook);
+        }).catch(e => {
+          return this.$message.error(e.message)
+        })
+      } else {
+        docx.renderAsync(new Blob(), this.$refs.file)
+        return this.$message.error("不支持这个类型的文件展示！")
+      }
+    },
     tableToHtml(workbook) {
       const sheetList = workbook.SheetNames.filter(v => v.indexOf('数据源') === -1);
       this.activeName = sheetList[0];

src/views/taskManagement/components/inspectionTaskFinished/inspectionTaskFinished.vue

@@ -1,17 +1,25 @@
-
 <!-- 检验任务(原料)页面 -->
 <template>
   <div class="examination">
     <div class="common-head-search">
       <el-form :inline='true'>
         <el-form-item label="物料名称">
-          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称" style="width: 200px"></el-input>
+          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="批次号">
-          <el-input v-model="search.batchNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入批次号" style="width: 200px"></el-input>
+          <el-input v-model="search.batchNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入批次号"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-           <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="search.entrTime"
            type="daterange"
            range-separator="至"
@@ -21,7 +29,7 @@
            style="width:300px"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -37,32 +45,35 @@
             检验任务信息
           </div>
           <div>
-            <el-button icon="el-icon-check"  type="goon" size="mini" :loading='copyLoading' v-privilege="activeMenu + 'copy'" @click="copyData">复制</el-button>
-          <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini" v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>
-          <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'" @click="recoverData">启用</el-button>
+            <el-button icon="el-icon-check" type="goon" size="mini" :loading='copyLoading'
+              v-privilege="activeMenu + 'copy'" @click="copyData">复制</el-button>
+            <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini"
+              v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>
+            <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini"
+              v-privilege="activeMenu + 'effectivity'" @click="recoverData">启用</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-           <el-table
-           v-loading="tableLoading1" ref="dataTable" border :height="tableTop"
-           highlight-current-row
-           @selection-change="handleSelectionChange"
-           @cell-click='searchFollow'
-           :data="tableData1"
-           :row-class-name="tableRowClassName"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading1" ref="dataTable" border :height="tableTop" highlight-current-row
+            @selection-change="handleSelectionChange" @cell-click='searchFollow' :data="tableData1"
+            :row-class-name="tableRowClassName" :icore-filter-flag="icoreFilterFlag"
+            :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
             <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stateFlagName" label="状态" align="center" ></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"  align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stateFlagName" label="状态"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="batchNo" label="批次号" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="gradeName" label="牌号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="matShapeName" label="试样形状" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="gradeName" label="牌号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="matShapeName" label="试样形状"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="tmpName" label="样品模板" align="center"></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPlanName" label="测试计划"  align="center"></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="taskName" label="方案号" align="center" style="color:blue;"></el-table-column>
@@ -70,26 +81,29 @@
             <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="deptName" label="检验车间" align="center"></el-table-column> -->
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="indexName" label="指标集" align="center" style="color:blue;"></el-table-column> -->
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sampleTypeName" label="样品类型" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="entrTypeName" label="委托类型"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiqName" label="是否商检" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatchName" label="是否匹配" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="entrTypeName" label="委托类型"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isCiqName" label="是否商检"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isBatchName" label="是否匹配"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- 分页一 -->
         <div class="common-foot-style">
-          <el-pagination
-          @size-change="pageSizeChange"
-          @current-change="pageCurrentChange"
-          :current-page="pageIndex"
-          :page-sizes="[10, 20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total" background>
+          <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="pageIndex"
+            :page-sizes="[10, 20, 50, 100, 200]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="total" background>
           </el-pagination>
         </div>
       </el-col>
@@ -102,42 +116,57 @@
             测试项目信息
           </div>
           <div>
-          <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini" v-privilege="activeMenu + 'disableDep'" @click="deleteData2">停用</el-button>
-          <el-button size="mini" type="goon" icon="el-icon-remove-outline" :loading='buttonLoading4' v-privilege="activeMenu + 'effectivityDep'" @click="recoverData2">启用</el-button>
+            <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini"
+              v-privilege="activeMenu + 'disableDep'" @click="deleteData2">停用</el-button>
+            <el-button size="mini" type="goon" icon="el-icon-remove-outline" :loading='buttonLoading4'
+              v-privilege="activeMenu + 'effectivityDep'" @click="recoverData2">启用</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-          <el-table
-           v-loading="tableLoading2" ref="dataTable2" border :height="tableBot"
-           highlight-current-row
-            @selection-change="handleSelectionChange2"
-           :data="tableData2"
-           @cell-click="clickTwoTable"
-           :row-class-name="tableRowClassName2"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading2" ref="dataTable2" border :height="tableBot" highlight-current-row
+            @selection-change="handleSelectionChange2" :data="tableData2" @cell-click="clickTwoTable"
+            :row-class-name="tableRowClassName2" :icore-filter-flag="icoreFilterFlag"
+            :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
             <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="stateFlagName" label="状态" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="validFlagName" label="数据状态" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testItemName" label="任务名称" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="itemTypeName" label="任务类型" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="optName" label="领用人" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="doOrder" label="执行顺序" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="isAutoName" label="是否分配" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="pointName" label="地点名称" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testLimit" label="任务时限" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="deptName" label="部门名称" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sectionName" label="班组名称" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testPostName" label="岗位" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="eqpTypeName" label="设备" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="stateFlagName" label="状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="optName" label="领用人"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="doOrder" label="执行顺序"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="isAutoName" label="是否分配"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stdName" label="标准号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="pointName" label="地点名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="deptName" label="部门名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sectionName" label="班组名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testPostName" label="岗位"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- <div class="common-foot-style">
@@ -160,23 +189,28 @@
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-          <el-table
-           v-loading="tableLoading3" ref="dataTable3" border :height="tableBot"
-           highlight-current-row
-           :data="tableData3"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading3" ref="dataTable3" border :height="tableBot" highlight-current-row
+            :data="tableData3" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testItemName" label="任务名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="anlyItemName" label="分析项目" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isRepost1" label="是否报出" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isAlarm1" label="是否报警" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="anlyItemName" label="分析项目"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isRepost1" label="是否报出"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="isAlarm1" label="是否报警"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- <div class="common-foot-style">
@@ -207,7 +241,7 @@
   </div>
 </template>
 <script>
-import {getCookie ,formatDate, isStartEndDate,} from '@/utils/util.js';
+import { getCookie, formatDate, isStartEndDate, } from '@/utils/util.js';
 import {
   cookieUserId,
   cookieUserName
@@ -215,7 +249,7 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  data () {
+  data() {
     return {
       icoreFilterFlag: true,
       taskId: '',
@@ -223,38 +257,38 @@ export default {
       search: {
         batchNo: '',
         mode: '',
-        entrTime:[]
+        entrTime: []
       },
-      tableData1:[],
-      tableData2:[],
-      tableData3:[],
-      tableLoading1:false,
-      tableLoading2:false,
-      tableLoading3:false,
-      copyLoading:false,
-      buttonLoading1:false,
-      buttonLoading2:false,
-      buttonLoading3:false,
-      buttonLoading4:false,
-      clickFlag:{},
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      tableLoading1: false,
+      tableLoading2: false,
+      tableLoading3: false,
+      copyLoading: false,
+      buttonLoading1: false,
+      buttonLoading2: false,
+      buttonLoading3: false,
+      buttonLoading4: false,
+      clickFlag: {},
       selectMain: [],
       selectDep: [],
-      tableTop:0,
-      tableBot:0,
-      pageIndex:1,
-      pageSize:100,
-      total:0,
+      tableTop: 0,
+      tableBot: 0,
+      pageIndex: 1,
+      pageSize: 100,
+      total: 0,
       multipleSelection4: [],
-      activeMenu:''
+      activeMenu: ''
     }
   },
   created() {
     this.tableTop = window.innerHeight / 2 - 140 < 249 ? 249 : window.innerHeight / 2 - 150;
     this.tableBot = window.innerHeight / 2 - 150 < 249 ? 249 : window.innerHeight / 2 - 150;
-    this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+    this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
   },
-   mounted () {
+  mounted() {
     this.searchData()
     this.addScreen();
     this.addScreen2();
@@ -303,85 +337,85 @@ export default {
       return sums;
     },
     //复制
-    copyData(){
+    copyData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要复制的数据')
         return
       }
       this.copyLoading = true
-      this.axios.post('pass/testManagement/v1/limstesttasks/copy', this.selectMain, {individualType: 'json'}).then(res =>{
-         if (res.code == 0 || res.code == 200) {
+      this.axios.post('pass/testManagement/v1/limstesttasks/copy', this.selectMain, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.copyLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.copyLoading = false
         this.$message.error(err.message)
       })
     },
     // 终止
-    deleteData () {
+    deleteData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要停用的数据')
         return
       }
       let tempArr = []
-      this.selectMain.map(item =>{
+      this.selectMain.map(item => {
         tempArr.push(item.id)
       })
       this.buttonLoading1 = true
-      this.axios.post('pass/testManagement/v1/limstesttasks/invalid', tempArr, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstesttasks/invalid', tempArr, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.buttonLoading1 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading1 = false
         this.$message.error(err.message)
       })
     },
     // 恢复
-    recoverData () {
+    recoverData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要启用的数据')
         return
       }
       let tempArr = []
-      this.selectMain.map(item =>{
+      this.selectMain.map(item => {
         tempArr.push(item.id)
       })
       this.buttonLoading2 = true
-      this.axios.post('pass/testManagement/v1/limstesttasks/valid', tempArr, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstesttasks/valid', tempArr, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.buttonLoading2 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading2 = false
         this.$message.error(err.message)
       })
     },
     // 查询
-    searchData(){
+    searchData() {
       this.selectMain = []
       this.pageIndex = 1
       this.pageSize = 100
       this.dataMain()
     },
     //查询检验任务信息
-    dataMain () {
+    dataMain() {
       this.tableData2 = []
       this.tableData3 = []
-      let startTime =''
+      let startTime = ''
       let endTime = ''
       if (!this.search.entrTime) {
         startTime = ''
@@ -391,18 +425,18 @@ export default {
         endTime = this.search.entrTime[1] + ' 23:59:59'
       }
       let tempobj = {
-        'object':{
+        'object': {
           "batchNo": this.search.batchNo,
           "sampleTypeCode": "480103",
-          "matName":this.search.matName
+          "matName": this.search.matName
         },
-        'pageIndex':this.pageIndex,
-        'pageSize':this.pageSize,
-        'startTime':startTime,
-        'endTime':endTime
+        'pageIndex': this.pageIndex,
+        'pageSize': this.pageSize,
+        'startTime': startTime,
+        'endTime': endTime
       }
       this.tableLoading1 = true
-      this.axios.post('pass/testManagement/v1/limstesttasks/queryLimsTestTasks',tempobj,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstesttasks/queryLimsTestTasks', tempobj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData1 = res.data.list;
           this.total = res.data.total;
@@ -416,7 +450,7 @@ export default {
             this.$refs.dataTable.setCurrentRow(this.tableData1[0])
             this.searchFollow(this.tableData1[0])
           }
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading1 = false
@@ -426,13 +460,13 @@ export default {
       });
     },
     //点击检验任务信息表格数据，查询测试项目信息数据
-    searchFollow(row){
+    searchFollow(row) {
       this.clickFlag = row
       this.tableLoading2 = true
-      this.axios.post('pass/testManagement/v1/limstesttaskds/queryLimsTestTaskDs?taskId='+row.id,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstesttaskds/queryLimsTestTaskDs?taskId=' + row.id, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData2 = res.data
-          this.tableData2.forEach(item =>{
+          this.tableData2.forEach(item => {
             item.validFlagName = item.validFlag == 0 ? '无效' : item.validFlag == 1 ? '有效' : ''
             item.isAutoName = item.isAuto == 0 ? '否' : item.isAuto == 1 ? '是' : ''
             item.stateFlagName = item.stateFlag == 0 ? '未执行' : item.stateFlag == 1 ? '已执行' : item.stateFlag == 2 ? '已领用' : item.stateFlag == 3 ? '已提交' : item.stateFlag == 4 ? '二审已审' : item.stateFlagName == 5 ? '三审已审' : ''
@@ -441,135 +475,134 @@ export default {
             this.$refs.dataTable2.setCurrentRow(this.tableData2[0])
             this.clickTwoTable(this.tableData2[0])
           }
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading2 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.tableLoading2 = false
         this.$message.error(err.message)
       })
     },
     //点击测试项目信息表格，查询分析项目信息
-    clickTwoTable(row){
+    clickTwoTable(row) {
       this.tableLoading3 = false
       this.tableData3 = row.lsidList
-      this.tableData3.forEach(item =>{
+      this.tableData3.forEach(item => {
         item.isReport1 = item.isReport == 0 ? '否' : item.isReport == 1 ? '是' : ''
         item.isAlarm1 = item.isAlarm == 0 ? '否' : item.isAlarm == 1 ? '是' : ''
       })
     },
-      // 重置
-    reset () {
+    // 重置
+    reset() {
       this.search.matName = '';
-      this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+      this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
       this.searchData();
     },
-     // 删除
-    deleteData2 () {
+    // 删除
+    deleteData2() {
       if (this.selectDep.length < 1) {
         this.$message.warning('请勾选测试任务信息表中您要停用的数据')
         return
       }
       let tempArr = []
-      this.selectDep.map(item =>{
+      this.selectDep.map(item => {
         tempArr.push(item.id)
       })
       this.buttonLoading3 = true
-      this.axios.post('pass/testManagement/v1/limstesttaskds/invalid',tempArr, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstesttaskds/invalid', tempArr, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message)
           this.searchFollow(this.clickFlag)
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.buttonLoading3 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading3 = false
         this.$message.error(err.message)
       })
     },
     // 取消
-    recoverData2 () {
-       if (this.selectDep.length < 1) {
+    recoverData2() {
+      if (this.selectDep.length < 1) {
         this.$message.warning('请勾选测试任务信息表中您要启用的数据')
         return
       }
       let tempArr = []
-      this.selectDep.map(item =>{
+      this.selectDep.map(item => {
         tempArr.push(item.id)
       })
       this.buttonLoading4 = true
-      this.axios.post('pass/testManagement/v1/limstesttaskds/valid',tempArr, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstesttaskds/valid', tempArr, { individualType: 'json' }).then(res => {
         this.buttonLoading4 = false
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message)
           this.searchFollow(this.clickFlag)
-        }else{
+        } else {
           this.$message.error(res.message)
         }
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading4 = false
         this.$message.error(err.message)
       })
     },
-    pageSizeChange (size) {
+    pageSizeChange(size) {
       this.pageIndex = 1
       this.pageSize = size;
       this.dataMain();
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.pageIndex = index;
       this.dataMain();
     },
     //勾选主表数据
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectMain = val;
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.selectDep = val
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    addScreen2 () {
+    addScreen2() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    addScreen3 () {
+    addScreen3() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable3.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable3.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    tableRowClassName ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
     },
-    tableRowClassName2 ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName2({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
       return '';
     },
     // 表格上横线
-    tableHeaderCellStyle () {
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style scoped>
-</style>
+<style scoped></style>

src/views/taskManagement/components/inspectionTaskRaw/inspectionTaskRaw.vue

@@ -4,25 +4,22 @@
     <div class="common-head-search">
       <el-form :inline="true">
         <el-form-item label="物料名称">
-          <el-input
-            v-model="search.matName"
-            @keyup.enter.native="searchData()"
-            size="small"
-            placeholder="请输入物料名称"
-            style="width: 200px"
-          ></el-input>
+          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="委托编号">
-          <el-input
-            v-model="search.carNo"
-            @keyup.enter.native="searchData()"
-            size="small"
-            placeholder="请输入委托编号"
-            style="width: 200px"
-          ></el-input>
+          <el-input v-model="search.carNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入委托编号"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="search.entrTime"
             type="daterange"
             range-separator="至"
@@ -33,24 +30,11 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            size="mini"
-            @click="searchData"
-            >查询</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            type="info"
-            plain
-            size="mini"
-            @click="reset"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -58,211 +42,68 @@
       <el-col>
         <div class="common-title-div">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
             检验任务信息
           </div>
           <div>
-            <el-button
-              icon="el-icon-circle-close"
-              :loading="buttonLoading1"
-              type="danger"
-              size="mini"
-              v-privilege="activeMenu + 'disable'"
-              @click="deleteData"
-              >停用</el-button
-            >
-            <el-button
-              icon="el-icon-check"
-              :loading="buttonLoading2"
-              type="goon"
-              size="mini"
-              v-privilege="activeMenu + 'effectivity'"
-              @click="recoverData"
-              >启用</el-button
-            >
+            <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini"
+              v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>
+            <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini"
+              v-privilege="activeMenu + 'effectivity'" @click="recoverData">启用</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom: 0; margin-top: 0">
-          <el-table
-            v-loading="tableLoading1"
-            ref="dataTable"
-            border
-            :height="tableTop"
-            highlight-current-row
-            @selection-change="handleSelectionChange"
-            @cell-click="searchFollow"
-            :data="tableData1"
-            :row-class-name="tableRowClassName"
-            :icore-filter-flag="icoreFilterFlag"
-            :header-cell-style="tableHeaderCellStyle"
-            :summary-method="getSummaries2"
-            show-summary
-          >
-            <el-table-column
-              type="index"
-              label="NO"
-              fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              type="selection"
-              width="55"
-              fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="stateFlagName"
-              label="状态"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="validFlagName"
-              label="数据状态"
-              align="center"
-            ></el-table-column>
+          <el-table v-loading="tableLoading1" ref="dataTable" border :height="tableTop" highlight-current-row
+            @selection-change="handleSelectionChange" @cell-click="searchFollow" :data="tableData1"
+            :row-class-name="tableRowClassName" :icore-filter-flag="icoreFilterFlag"
+            :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
+            <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+            <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stateFlagName" label="状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="entrId" label="委托ID" align="center"></el-table-column> -->
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="carNo"
-              label="委托编号"
-              align="center"
-              style="color: blue"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="sampleNo"
-              label="中心编号"
-              align="center"
-              style="color: blue"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="matName"
-              label="物料"
-              align="center"
-            ></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="carNo" label="委托编号"
+              align="center" style="color: blue"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleNo" label="中心编号"
+              align="center" style="color: blue"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="tmpName" label="样品模板" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testPlanName" label="测试计划"  align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="taskName" label="方案号" align="center" style="color:blue;"></el-table-column> -->
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="indexName" label="指标集" align="center" style="color:blue;"></el-table-column> -->
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="sampleTypeName"
-              label="样品类型"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="entrTypeName"
-              label="委托类型"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="100px"
-              prop="memo"
-              label="备注"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="160px"
-              prop="taskDate"
-              label="任务日期"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="receivedDate"
-              label="收样日期"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="isCiqName"
-              label="是否商检"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="isBatchName"
-              label="是否匹配"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="createMan"
-              label="创建人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="createTime"
-              label="创建时间"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="updateMan"
-              label="修改人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="updateTime"
-              label="修改时间"
-              align="center"
-            ></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleTypeName" label="样品类型"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="entrTypeName" label="委托类型"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="160px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="receivedDate" label="收样日期"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="isCiqName" label="是否商检"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="isBatchName" label="是否匹配"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- 分页一 -->
         <div class="common-foot-style">
-          <el-pagination
-            @size-change="pageSizeChange"
-            @current-change="pageCurrentChange"
-            :current-page="pageIndex"
-            :page-sizes="[50, 100, 300, 500, 1000]"
-            :page-size="pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-            background
-          >
+          <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="pageIndex"
+            :page-sizes="[50, 100, 300, 500, 1000]" :page-size="pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" background>
           </el-pagination>
         </div>
       </el-col>
@@ -271,169 +112,55 @@
       <el-col :span="12">
         <div class="common-title-div">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
             测试项目信息
           </div>
           <div>
-            <el-button
-              icon="el-icon-circle-close"
-              type="danger"
-              :loading="buttonLoading3"
-              size="mini"
-              v-privilege="activeMenu + 'disableDep'"
-              @click="deleteData2"
-              >停用</el-button
-            >
-            <el-button
-              size="mini"
-              type="goon"
-              icon="el-icon-remove-outline"
-              :loading="buttonLoading4"
-              v-privilege="activeMenu + 'effectivityDep'"
-              @click="recoverData2"
-              >启用</el-button
-            >
+            <el-button icon="el-icon-circle-close" type="danger" :loading="buttonLoading3" size="mini"
+              v-privilege="activeMenu + 'disableDep'" @click="deleteData2">停用</el-button>
+            <el-button size="mini" type="goon" icon="el-icon-remove-outline" :loading="buttonLoading4"
+              v-privilege="activeMenu + 'effectivityDep'" @click="recoverData2">启用</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom: 0; margin-top: 0">
-          <el-table
-            v-loading="tableLoading2"
-            ref="dataTable2"
-            border
-            :height="tableBot"
-            highlight-current-row
-            @selection-change="handleSelectionChange2"
-            :data="tableData2"
-            @cell-click="clickTwoTable"
-            :row-class-name="tableRowClassName2"
-            :icore-filter-flag="icoreFilterFlag"
-            :header-cell-style="tableHeaderCellStyle"
-            :summary-method="getSummaries2"
-            show-summary
-          >
-            <el-table-column
-              type="index"
-              label="NO"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              type="selection"
-              width="55"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="stateFlagName"
-              label="状态"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="validFlagName"
-              label="数据状态"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="testItemName"
-              label="任务名称"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="itemTypeName"
-              label="任务类型"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="80px"
-              prop="optName"
-              label="领用人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="doOrder"
-              label="执行顺序"
-              align="center"
-            ></el-table-column>
+          <el-table v-loading="tableLoading2" ref="dataTable2" border :height="tableBot" highlight-current-row
+            @selection-change="handleSelectionChange2" :data="tableData2" @cell-click="clickTwoTable"
+            :row-class-name="tableRowClassName2" :icore-filter-flag="icoreFilterFlag"
+            :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
+            <el-table-column type="index" label="NO" align="center"></el-table-column>
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="stateFlagName" label="状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="80px" prop="optName" label="领用人"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="doOrder" label="执行顺序"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="isAutoName" label="是否分配" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="pointName" label="地点名称" align="center"></el-table-column> -->
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="testLimit"
-              label="任务时限"
-              align="center"
-            ></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="deptName" label="部门名称" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sectionName" label="班组名称" align="center"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testPostName" label="岗位" align="center"></el-table-column> -->
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="eqpTypeName"
-              label="设备"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="100px"
-              prop="memo"
-              label="备注"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="createMan"
-              label="创建人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="createTime"
-              label="创建时间"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="updateMan"
-              label="修改人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="updateTime"
-              label="修改时间"
-              align="center"
-            ></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- <div class="common-foot-style">
@@ -451,104 +178,33 @@
       <el-col :span="12">
         <div class="common-title-div">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
             分析项目信息
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom: 0; margin-top: 0">
-          <el-table
-            v-loading="tableLoading3"
-            ref="dataTable3"
-            border
-            :height="tableBot"
-            highlight-current-row
-            :data="tableData3"
-            :icore-filter-flag="icoreFilterFlag"
-            :header-cell-style="tableHeaderCellStyle"
-            :summary-method="getSummaries2"
-            show-summary
-          >
-            <el-table-column
-              type="index"
-              label="NO"
-              fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="testItemName"
-              label="任务名称"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="anlyItemName"
-              label="分析项目"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="isReport1"
-              label="是否报出"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              sortable
-              min-width="100px"
-              prop="isAlarm1"
-              label="是否报警"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="100px"
-              prop="memo"
-              label="备注"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="createMan"
-              label="创建人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="createTime"
-              label="创建时间"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="95px"
-              prop="updateMan"
-              label="修改人"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              sortable
-              :show-overflow-tooltip="true"
-              min-width="160px"
-              prop="updateTime"
-              label="修改时间"
-              align="center"
-            ></el-table-column>
+          <el-table v-loading="tableLoading3" ref="dataTable3" border :height="tableBot" highlight-current-row
+            :data="tableData3" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
+            <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="anlyItemName" label="分析项目"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="isReport1" label="是否报出"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="isAlarm1" label="是否报警"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- <div class="common-foot-style">
@@ -778,24 +434,24 @@ export default {
                 item.validFlag == 0
                   ? "无效"
                   : item.validFlag == 1
-                  ? "有效"
-                  : "";
+                    ? "有效"
+                    : "";
               item.stateFlagName =
                 item.stateFlag == 0
                   ? "编辑"
                   : item.stateFlag == 1
-                  ? "取样"
-                  : item.stateFlag == 2
-                  ? "制样"
-                  : item.stateFlag == 3
-                  ? "检验"
-                  : item.stateFlag == 4
-                  ? "审核"
-                  : item.stateFlag == 5
-                  ? "发布"
-                  : item.stateFlag == 6
-                  ? "质保书"
-                  : "";
+                    ? "取样"
+                    : item.stateFlag == 2
+                      ? "制样"
+                      : item.stateFlag == 3
+                        ? "检验"
+                        : item.stateFlag == 4
+                          ? "审核"
+                          : item.stateFlag == 5
+                            ? "发布"
+                            : item.stateFlag == 6
+                              ? "质保书"
+                              : "";
               item.isCiqName =
                 item.isCiq == 0 ? "否" : item.isCiq == 1 ? "是" : "";
               item.isBatchName =
@@ -825,7 +481,7 @@ export default {
       this.axios
         .post(
           "pass/testManagement/v1/limstesttaskds/queryLimsTestTaskDs?taskId=" +
-            row.id,
+          row.id,
           { individualType: "json" }
         )
         .then((res) => {
@@ -836,24 +492,24 @@ export default {
                 item.validFlag == 0
                   ? "无效"
                   : item.validFlag == 1
-                  ? "有效"
-                  : "";
+                    ? "有效"
+                    : "";
               item.isAutoName =
                 item.isAuto == 0 ? "否" : item.isAuto == 1 ? "是" : "";
               item.stateFlagName =
                 item.stateFlag == 0
                   ? "未执行"
                   : item.stateFlag == 1
-                  ? "已执行"
-                  : item.stateFlag == 2
-                  ? "已领用"
-                  : item.stateFlag == 3
-                  ? "已提交"
-                  : item.stateFlag == 4
-                  ? "二审已审"
-                  : item.stateFlag == 5
-                  ? "三审已审"
-                  : "";
+                    ? "已执行"
+                    : item.stateFlag == 2
+                      ? "已领用"
+                      : item.stateFlag == 3
+                        ? "已提交"
+                        : item.stateFlag == 4
+                          ? "二审已审"
+                          : item.stateFlag == 5
+                            ? "三审已审"
+                            : "";
             });
             if (this.tableData2.length > 0) {
               this.$refs.dataTable2.setCurrentRow(this.tableData2[0]);

src/views/taskManagement/components/planReassignment/planReassignment.vue

@@ -1,67 +1,49 @@
-
 <!-- 任务分配(成品)页面 -->
 <template>
   <div class="examination">
     <div class="common-head-search">
       <el-form :inline='true'>
         <el-form-item label="检验车间">
-          <el-select
-            v-model="search.deptNo"
-            filterable
-            clearable
-            style="width:150px"
-            collapse-tags
-            @clear='clearSelect'
-            @change="selectClass"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionNameType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.deptNo" filterable clearable style="width:150px" collapse-tags @clear='clearSelect'
+            @change="selectClass" size="small">
+            <el-option v-for="item in sectionNameType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验班组">
-          <el-select
-            v-model="search.sectionNo"
-            filterable
-            clearable
-            style="width:150px"
-            collapse-tags
-            @change="selectSection"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionClassType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.sectionNo" filterable clearable style="width:150px" collapse-tags
+            @change="selectSection" size="small">
+            <el-option v-for="item in sectionClassType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="岗位">
-          <el-select v-model="search.jobs" clearable  style="width:150px" filterable collapse-tags size="small" >
-            <el-option v-for="(item,index) in postType" :key="index" :label="item.postName"
-              :value="item.postNo">
+          <el-select v-model="search.jobs" clearable style="width:150px" filterable collapse-tags size="small">
+            <el-option v-for="(item, index) in postType" :key="index" :label="item.postName" :value="item.postNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label='样品类型'>
-          <el-select v-model="search.sampleTypeCode" clearable filterable collapse-tags size="small" style="width:150px;" placeholder="请选择">
+          <el-select v-model="search.sampleTypeCode" clearable filterable collapse-tags size="small"
+            style="width:150px;" placeholder="请选择">
             <el-option v-for="item in sampleTypeNameType" :key="item.baseCode" :label="item.baseName"
               :value="item.baseCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称" style="width:150px"></el-input>
+          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称"
+            style="width:150px"></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="search.entrTime"
            type="daterange"
            range-separator="至"
@@ -71,144 +53,173 @@
            style="width:270px"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button icon="el-icon-search" type="goon" size="mini" :disable='disSearch' @click="searchData">查询</el-button>
-          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable='disSearch' @click="reset">重置</el-button>
+          <el-button icon="el-icon-search" type="goon" size="mini" :disable='disSearch'
+            @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable='disSearch'
+            @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <el-tabs type="border-card" v-model="activeName">
       <el-tab-pane label="任务未分配" name="first">
-        <span slot="label">任务未分配<el-badge :max="10" :hidden='total == 0' style="margin-top:-18px" :value="total"></el-badge></span>
+        <span slot="label">任务未分配<el-badge :max="10" :hidden='total == 0' style="margin-top:-18px"
+            :value="total"></el-badge></span>
         <div class="common-title-div">
           <div class="common-title-name">
             <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
             任务未分配
           </div>
           <div>
-          <el-button icon="el-icon-check"  type="goon" size="mini" v-privilege="activeMenu + 'distribution'" @click="checkAllot">分配</el-button>
-          <el-button icon="el-icon-check"  type="goon" size="mini" :loading='recipientsLoading' v-privilege="activeMenu + 'recipients'"  @click="recipients">领用</el-button>
-          <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini" v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>
-          <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'"  @click="recoverData">启用</el-button>
+            <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'distribution'"
+              @click="checkAllot">分配</el-button>
+            <el-button icon="el-icon-check" type="goon" size="mini" :loading='recipientsLoading'
+              v-privilege="activeMenu + 'recipients'" @click="recipients">领用</el-button>
+            <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini"
+              v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>
+            <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini"
+              v-privilege="activeMenu + 'effectivity'" @click="recoverData">启用</el-button>
           </div>
         </div>
         <div class="common-table-div">
-           <el-table
-           v-loading="tableLoading1" ref="dataTable" border :height="tableTop"
-           highlight-current-row
-           @selection-change="handleSelectionChange"
-           :data="tableData1"
-           :row-class-name="tableRowClassName"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading1" ref="dataTable" border :height="tableTop" highlight-current-row
+            @selection-change="handleSelectionChange" :data="tableData1" :row-class-name="tableRowClassName"
+            :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" align="center"></el-table-column>
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isAutoName" label="分配类型" align="center" ></el-table-column> -->
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="typeName" label="样品编号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="tkId" label="任务编号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
-             <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="车号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='testItemName' label="任务名称"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="itemTypeName" label="任务类型"  align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="typeName" label="样品编号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="tkId" label="任务编号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="车号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder'
+              label="物料顺序"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='testItemName'
+              label="任务名称"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点名称"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态" align="center" ></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- 分页一 -->
         <div class="common-foot-style">
-          <el-pagination
-          @size-change="pageSizeChange"
-          @current-change="pageCurrentChange"
-          :current-page="pageIndex"
-          :page-sizes="[10, 20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total" background>
+          <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="pageIndex"
+            :page-sizes="[10, 20, 50, 100, 200]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="total" background>
           </el-pagination>
         </div>
       </el-tab-pane>
       <el-tab-pane label="任务已分配" name="second">
-        <span slot="label">任务已分配<el-badge :max="10" :hidden='totalDep == 0' style="margin-top:-18px" :value="totalDep"></el-badge></span>
+        <span slot="label">任务已分配<el-badge :max="10" :hidden='totalDep == 0' style="margin-top:-18px"
+            :value="totalDep"></el-badge></span>
         <div class="common-title-div">
           <div class="common-title-name">
             <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
             任务已分配
           </div>
           <div>
-          <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini" v-privilege="activeMenu + 'Unassign'" @click="cancel">取消分配</el-button>
+            <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini"
+              v-privilege="activeMenu + 'Unassign'" @click="cancel">取消分配</el-button>
           </div>
         </div>
         <div class="common-table-div">
-          <el-table
-           v-loading="tableLoading2" ref="dataTable2" border :height="tableBot"
-           highlight-current-row
-            @selection-change="handleSelectionChange2"
-           :data="tableData2"
-           :row-class-name="tableRowClassName2"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading2" ref="dataTable2" border :height="tableBot" highlight-current-row
+            @selection-change="handleSelectionChange2" :data="tableData2" :row-class-name="tableRowClassName2"
+            :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" align="center"></el-table-column>
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isAutoName" label="分配类型" align="center" ></el-table-column> -->
-<!--            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stateFlag" label="状态" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span v-if="scope.row.stateFlag === '1'">已分配</span>-->
-<!--                <span v-else-if="scope.row.stateFlag === '2'">已接收</span>-->
-<!--                <span v-else-if="scope.row.stateFlag === '3'">已提交</span>-->
-<!--                <span v-else-if="scope.row.stateFlag === '4'">已二审</span>-->
-<!--                <span v-else-if="scope.row.stateFlag === '5'">已三审</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="typeName" label="样品编号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="taskDate" label="任务日期" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="车号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName" label="任务名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="itemTypeName" label="任务类型"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="optName" label="执行人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="deptName" label="部门名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="班组名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态" align="center" ></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <!--            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="stateFlag" label="状态" align="center">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <span v-if="scope.row.stateFlag === '1'">已分配</span>-->
+            <!--                <span v-else-if="scope.row.stateFlag === '2'">已接收</span>-->
+            <!--                <span v-else-if="scope.row.stateFlag === '3'">已提交</span>-->
+            <!--                <span v-else-if="scope.row.stateFlag === '4'">已二审</span>-->
+            <!--                <span v-else-if="scope.row.stateFlag === '5'">已三审</span>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="typeName" label="样品编号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="carNo" label="车号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder'
+              label="物料顺序"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="optName" label="执行人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="deptName" label="部门名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="班组名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <div class="common-foot-style">
-          <el-pagination
-          @size-change="pageSizeChange2"
-          @current-change="pageCurrentChange2"
-          :current-page="pageIndex_dep"
-          :page-sizes="[10, 20, 50, 100, 200]"
-          :page-size="pageSize_dep"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="totalDep" background>
+          <el-pagination @size-change="pageSizeChange2" @current-change="pageCurrentChange2"
+            :current-page="pageIndex_dep" :page-sizes="[10, 20, 50, 100, 200]" :page-size="pageSize_dep"
+            layout="total, sizes, prev, pager, next, jumper" :total="totalDep" background>
           </el-pagination>
         </div>
       </el-tab-pane>
@@ -220,40 +231,36 @@
       </div>
       <el-form :inline='true' @submit.native.prevent>
         <el-form-item label="人员编号">
-          <el-input v-model="form.empNo" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件" style="width: 200px"></el-input>
+          <el-input v-model="form.empNo" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="人员名称">
-          <el-input v-model="form.empName" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件" style="width: 200px"></el-input>
+          <el-input v-model="form.empName" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" @click="searchAllot" size="mini">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-      v-loading="allotLoading" ref="dataTable" border height="300"
-       highlight-current-row
-       @row-click='handleAllot'
-       :data="allotData"
-       :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle"
-       :summary-method="getSummaries2" show-summary>
+      <el-table v-loading="allotLoading" ref="dataTable" border height="300" highlight-current-row
+        @row-click='handleAllot' :data="allotData" :icore-filter-flag="icoreFilterFlag"
+        :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
         <el-table-column type="index" label="NO" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="empNo" label="人员编号" align="center" ></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="empName" label="人员姓名" align="center" ></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="deptName" label="部门" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="wrkGrpName" label="班组" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="empNo" label="人员编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="empName" label="人员姓名"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="deptName" label="部门"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="wrkGrpName" label="班组"
+          align="center"></el-table-column>
       </el-table>
       <div>
-          <el-pagination
-          @size-change="pageSizeAllot"
-          @current-change="pageCurrentAllot"
-          :current-page="allotIndex"
-          :page-sizes="[100, 200,500]"
-          :page-size="allotPage"
-          layout="total, sizes, prev, pager, next, jumper"
+        <el-pagination @size-change="pageSizeAllot" @current-change="pageCurrentAllot" :current-page="allotIndex"
+          :page-sizes="[100, 200, 500]" :page-size="allotPage" layout="total, sizes, prev, pager, next, jumper"
           :total="allotTotal" background>
-          </el-pagination>
-        </div>
+        </el-pagination>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="goon" size="mini" icon="el-icon-check" @click="allocation()">确定</el-button>
         <el-button size="mini" type="goon" icon="el-icon-remove-outline" @click="cancelData">取消</el-button>
@@ -262,7 +269,7 @@
   </div>
 </template>
 <script>
-import {getCookie ,formatDate, isStartEndDate,} from '@/utils/util.js';
+import { getCookie, formatDate, isStartEndDate, } from '@/utils/util.js';
 import {
   cookieUserId,
   cookieUserName
@@ -270,84 +277,84 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  data () {
+  data() {
     return {
       icoreFilterFlag: true,
-      dialogTableVisible:false,
-      activeName:'first',
+      dialogTableVisible: false,
+      activeName: 'first',
       taskId: '',
       testItemNo: '',
-      form:{
-        empNo:'',
-        empName:''
+      form: {
+        empNo: '',
+        empName: ''
       },
-      jobType:[],
-      postType:[],
-      allotIndex:1,
-      allotPage:100,
-      allotTotal:0,
-      classNo:'',
-      deptNo:'',
-      sectionNo:'',
-      allotLoading:false,
+      jobType: [],
+      postType: [],
+      allotIndex: 1,
+      allotPage: 100,
+      allotTotal: 0,
+      classNo: '',
+      deptNo: '',
+      sectionNo: '',
+      allotLoading: false,
       search: {
         mode: '',
-        deptNo:'',
-        sectionNo:'',
-        entrTime:[],
-        itemTypeName:'',
-        jobs:''
+        deptNo: '',
+        sectionNo: '',
+        entrTime: [],
+        itemTypeName: '',
+        jobs: ''
       },
-      sectionNameType:[],
-      sectionClassType:[],
-      companyNameType:[],
-      disSearch:false,
-      allotData:[],
-      clickAllot:{},
-      tableData1:[],
-      tableData2:[],
-      tableData3:[],
+      sectionNameType: [],
+      sectionClassType: [],
+      companyNameType: [],
+      disSearch: false,
+      allotData: [],
+      clickAllot: {},
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
       sampleTypeNameType: [],
-      tableLoading1:false,
-      tableLoading2:false,
-      tableLoading3:false,
-      recipientsLoading:false,
-      buttonLoading1:false,
-      buttonLoading2:false,
-      buttonLoading3:false,
-      buttonLoading4:false,
-      itemType:[],
+      tableLoading1: false,
+      tableLoading2: false,
+      tableLoading3: false,
+      recipientsLoading: false,
+      buttonLoading1: false,
+      buttonLoading2: false,
+      buttonLoading3: false,
+      buttonLoading4: false,
+      itemType: [],
       selectMain: [],
       selectDep: [],
-      tableTop:0,
-      tableBot:0,
-      pageIndex:1,
-      pageSize:100,
-      total:0,
-      pageIndex_dep:1,
-      pageSize_dep:100,
-      totalDep:0,
-      activeMenu:''
+      tableTop: 0,
+      tableBot: 0,
+      pageIndex: 1,
+      pageSize: 100,
+      total: 0,
+      pageIndex_dep: 1,
+      pageSize_dep: 100,
+      totalDep: 0,
+      activeMenu: ''
     }
   },
   created() {
     this.tableTop = window.innerHeight - 230;
     this.tableBot = window.innerHeight - 230;
-    this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+    this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
-    this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList',{}, {individualType: 'json'}).then(res =>{
+    this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList', {}, { individualType: 'json' }).then(res => {
       this.jobType = res.data
     })
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{},{ individualType: "json" }).then((response) => {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: "json" }).then((response) => {
       this.companyNameType = response.data;
       this.getCompany()
       this.selectDepartment('F31300000')
     });
-    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode",{validFlag:1,baseCode:4801}, {individualType: 'json'}).then(res => {
+    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode", { validFlag: 1, baseCode: 4801 }, { individualType: 'json' }).then(res => {
       this.sampleTypeNameType = res.data
     })
   },
-  mounted () {
+  mounted() {
     this.searchAllot()
     this.addScreen();
     this.addScreen2();
@@ -402,10 +409,10 @@ export default {
         }
       });
     },
-    clearSelect(){
+    clearSelect() {
       this.search.sectionNo = ''
-      this.postType=''
-      this.search.jobs=''
+      this.postType = ''
+      this.search.jobs = ''
     },
     //根据选中的部门名称，查询班组名称
     selectClass(val) {
@@ -426,71 +433,71 @@ export default {
         }
       });
     },
-    selectSection(val){
-      this.search.jobs=''
+    selectSection(val) {
+      this.search.jobs = ''
       this.selectPost(val)
     },
-    selectPost(val){
-      this.postType=[]
-      this.jobType.forEach(item=>{
-        if (val === item.sectionNo){
+    selectPost(val) {
+      this.postType = []
+      this.jobType.forEach(item => {
+        if (val === item.sectionNo) {
           this.postType.push(item);
         }
       })
     },
-    closeDialog(){
+    closeDialog() {
       this.clickAllot = {}
-      this.form ={
-        empNo:'',
-        empName:''
+      this.form = {
+        empNo: '',
+        empName: ''
       }
       // this.searchAllot()
     },
-    cancelData(){
+    cancelData() {
       this.clickAllot = {}
-      this.form ={
-        empNo:'',
-        empName:''
+      this.form = {
+        empNo: '',
+        empName: ''
       },
-      this.searchAllot()
+        this.searchAllot()
       this.dialogTableVisible = false
     },
-    searchAllot(){
+    searchAllot() {
       this.allotIndex = 1
       this.allotPage = 100
       this.dataAllot()
     },
-    dataAllot(){
+    dataAllot() {
       this.clickAllot = {}
       this.allotLoading = true
       let obj = {
-        object:{
-          empNo:this.form.empNo,
-          empName:this.form.empName,
-          validFlag:1
+        object: {
+          empNo: this.form.empNo,
+          empName: this.form.empName,
+          validFlag: 1
         },
-        pageIndex:this.allotIndex,
-        pageSize:this.allotPage
+        pageIndex: this.allotIndex,
+        pageSize: this.allotPage
       }
-      this.axios.post('pass/baseManagement/v1/limslrcemps/queryEmpPagesDS', obj, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/baseManagement/v1/limslrcemps/queryEmpPagesDS', obj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.allotData = res.data.list;
           this.allotTotal = res.data.total
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.allotLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.allotLoading = false
         this.$message.error(err.message);
       })
     },
-    checkAllot(){
+    checkAllot() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要分配的数据')
         return
       }
-      for(let item of this.selectMain){
+      for (let item of this.selectMain) {
         if (item.validFlag == 0) {
           this.$message.warning('已停用的数据不可进行分配')
           return
@@ -499,8 +506,8 @@ export default {
       this.dialogTableVisible = true
     },
     //获取个人所属哪个公司
-    getCompany(){
-      this.axios.get('pass/baseManagement/v1/limslrcemps/'+userId).then(res =>{
+    getCompany() {
+      this.axios.get('pass/baseManagement/v1/limslrcemps/' + userId).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.search.jobs = res.data ? res.data.postNo : ''
           this.search.deptNo = res.data ? res.data.deptNo : ''
@@ -508,50 +515,50 @@ export default {
           this.selectClass2(this.search.deptNo)
           this.selectPost(this.search.sectionNo)
           this.searchData()
-        }else{
+        } else {
           this.disSearch = true
           this.$message.error(e.message)
         }
-      }).catch(e =>{
+      }).catch(e => {
         this.disSearch = true
         this.$message.error(e.message)
       })
     },
     ///分配
-    allocation(){
-      if (JSON.stringify(this.clickAllot)==="{}") {
+    allocation() {
+      if (JSON.stringify(this.clickAllot) === "{}") {
         this.$message.warning('请先点击选中一条数据')
         return
       }
       let newList = []
       newList = JSON.parse(JSON.stringify(this.selectMain))
-      newList.forEach(item =>{
+      newList.forEach(item => {
         item.optNo = this.clickAllot.empNo,
-        item.optName =this.clickAllot.empName,
-        item.deptNo = this.clickAllot.deptNo,
-        item.deptName = this.clickAllot.deptName,
-        item.sectionNo = this.clickAllot.sectionNo,
-        item.sectionName = this.clickAllot.sectionName
+          item.optName = this.clickAllot.empName,
+          item.deptNo = this.clickAllot.deptNo,
+          item.deptName = this.clickAllot.deptName,
+          item.sectionNo = this.clickAllot.sectionNo,
+          item.sectionName = this.clickAllot.sectionName
       })
-      this.axios.post('pass/testManagement/v1/limstasktests/assign',newList, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.dialogTableVisible = false
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
-      }).catch(err =>{
+      }).catch(err => {
         this.$message.error(err.message);
       })
     },
     //领用
-    recipients(){
+    recipients() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要领用的数据')
         return
       }
-      for(let item of this.selectMain){
+      for (let item of this.selectMain) {
         if (item.validFlag == 0) {
           this.$message.warning('已停用的数据不可进行领用')
           return
@@ -560,70 +567,70 @@ export default {
       let newList = []
       newList = JSON.parse(JSON.stringify(this.selectMain))
       this.recipientsLoading = true
-      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.recipientsLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.recipientsLoading = false
         this.$message.error(err.message);
       })
     },
     // 终止
-    deleteData () {
+    deleteData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要停用的数据')
         return
       }
       this.buttonLoading1 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/abolish', this.selectMain, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/abolish', this.selectMain, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading1 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading1 = false
         this.$message.error(err.message);
       })
     },
     // 恢复
-    recoverData () {
+    recoverData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要启用的数据')
         return
       }
       this.buttonLoading2 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/recover', this.selectMain, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/recover', this.selectMain, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading2 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading2 = false
         this.$message.error(err.message);
       })
     },
     // 查询
-    searchData(){
+    searchData() {
       this.selectMain = []
       this.pageIndex = 1
       this.pageSize = 100
       this.dataMain()
       this.dataDep()
     },
-    dataMain () {
+    dataMain() {
       this.tableLoading1 = true
-      let startTime =''
+      let startTime = ''
       let endTime = ''
       if (!this.search.entrTime) {
         startTime = ''
@@ -633,21 +640,21 @@ export default {
         endTime = this.search.entrTime[1] + ' 23:59:59'
       }
       let tempobj = {
-        'object':{
-          'itemTypeName':this.search.itemTypeName,
+        'object': {
+          'itemTypeName': this.search.itemTypeName,
           'stateFlag': 0,
-          'sampleTypeCode':this.search.sampleTypeCode,
+          'sampleTypeCode': this.search.sampleTypeCode,
         },
-        'mode3':this.search.matName,
-        'mode4':this.search.deptNo,
+        'mode3': this.search.matName,
+        'mode4': this.search.deptNo,
         'list': this.search.sectionNo ? [this.search.sectionNo] : [],
         'mode': this.search.jobs ? this.search.jobs : this.classNo,
-        'pageIndex':this.pageIndex,
-        'pageSize':this.pageSize,
-        'startTime':startTime,
-        'endTime':endTime
+        'pageIndex': this.pageIndex,
+        'pageSize': this.pageSize,
+        'startTime': startTime,
+        'endTime': endTime
       }
-      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage',tempobj,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage', tempobj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData1 = res.data.list;
           this.total = res.data.total;
@@ -657,7 +664,7 @@ export default {
             item.stateFlagName = item.stateFlag == 0 ? '未分配' : item.stateFlag == 1 ? '已分配' : ''
             item.isAutoName = item.isAuto == 0 ? '手动' : item.isAuto == 1 ? '自动' : ''
           })
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading1 = false
@@ -666,9 +673,9 @@ export default {
         this.$message.error(e.message)
       });
     },
-    dataDep () {
+    dataDep() {
       this.tableLoading2 = true
-      let startTime =''
+      let startTime = ''
       let endTime = ''
       if (!this.search.entrTime) {
         startTime = ''
@@ -678,21 +685,21 @@ export default {
         endTime = this.search.entrTime[1] + ' 23:59:59'
       }
       let tempobj = {
-        'object':{
-          'itemTypeName':this.search.itemTypeName,
-          'sampleTypeCode':this.search.sampleTypeCode,
+        'object': {
+          'itemTypeName': this.search.itemTypeName,
+          'sampleTypeCode': this.search.sampleTypeCode,
         },
-        'mode3':this.search.matName,
-        'mode4':this.search.deptNo,
+        'mode3': this.search.matName,
+        'mode4': this.search.deptNo,
         'list': this.search.sectionNo ? [this.search.sectionNo] : [],
-        'list2': [1,2,3,4,5],
+        'list2': [1, 2, 3, 4, 5],
         'mode': this.search.jobs ? this.search.jobs : this.classNo,
-        'pageIndex':this.pageIndex_dep,
-        'pageSize':this.pageSize_dep,
-        'startTime':startTime,
-        'endTime':endTime
+        'pageIndex': this.pageIndex_dep,
+        'pageSize': this.pageSize_dep,
+        'startTime': startTime,
+        'endTime': endTime
       }
-      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage',tempobj,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage', tempobj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData2 = res.data.list;
           this.totalDep = res.data.total;
@@ -702,7 +709,7 @@ export default {
             item.stateFlagName = item.stateFlag == 0 ? '未分配' : item.stateFlag == 1 ? '已分配' : ''
             item.isAutoName = item.isAuto == 0 ? '手动' : item.isAuto == 1 ? '自动' : ''
           })
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading2 = false
@@ -711,107 +718,106 @@ export default {
         this.$message.error(e.message)
       });
     },
-      // 重置
-    reset () {
+    // 重置
+    reset() {
       this.search.matName = '';
       this.search.jobs = ''
       this.search.deptNo = ''
       this.search.sectionNo = ''
-      this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+      this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
       this.searchData();
     },
-     // 取消分配
-    cancel () {
+    // 取消分配
+    cancel() {
       if (this.selectDep.length < 1) {
         this.$message.warning('请勾选需要取消分配的数据')
         return
       }
 
       this.buttonLoading3 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/unassign',this.selectDep, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/unassign', this.selectDep, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading3 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading3 = false
         this.$message.error(err.message);
       })
     },
-    pageSizeAllot (size) {
+    pageSizeAllot(size) {
       this.allotIndex = 1
       this.allotPage = size;
       this.dataAllot()
     },
-    pageCurrentAllot (index) {
+    pageCurrentAllot(index) {
       this.allotIndex = index;
       this.dataAllot()
     },
-    pageSizeChange (size) {
+    pageSizeChange(size) {
       this.pageIndex = 1
       this.pageSize = size;
       this.dataMain()
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.pageIndex = index;
       this.dataMain()
     },
-    pageSizeChange2 (size) {
+    pageSizeChange2(size) {
       this.pageIndex_dep = 1
       this.pageSize_dep = size;
       this.dataDep()
     },
-    pageCurrentChange2 (index) {
+    pageCurrentChange2(index) {
       this.pageIndex_dep = index;
       this.dataDep()
     },
     //勾选主表数据
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectMain = val;
     },
     //勾选人员表格数据
-    handleAllot (val) {
-      this.clickAllot = Object.assign({},val);
+    handleAllot(val) {
+      this.clickAllot = Object.assign({}, val);
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.selectDep = val
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-     addScreen2 () {
+    addScreen2() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
-          this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
-       });
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
+        this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
+      });
     },
-    tableRowClassName ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
     },
-    tableRowClassName2 ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName2({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
       return '';
     },
     // 表格上横线
-    tableHeaderCellStyle () {
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style scoped>
-</style>
+<style scoped></style>

src/views/taskManagement/components/taskAllocationMaterial/taskAllocationMaterial.vue

@@ -4,59 +4,22 @@
     <div class="common-head-search">
       <el-form :inline="true">
         <el-form-item label="检验车间">
-          <el-select
-            v-model="search.deptNo"
-            filterable
-            clearable
-            style="width: 100%"
-            collapse-tags
-            @clear="clearSelect"
-            @change="selectClass"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionNameType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.deptNo" filterable clearable style="width: 100%" collapse-tags @clear="clearSelect"
+            @change="selectClass" size="small">
+            <el-option v-for="item in sectionNameType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验班组">
-          <el-select
-            v-model="search.sectionNo"
-            filterable
-            clearable
-            style="width: 100%"
-            collapse-tags
-            @change="selectSection"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionClassType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.sectionNo" filterable clearable style="width: 100%" collapse-tags
+            @change="selectSection" size="small">
+            <el-option v-for="item in sectionClassType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="岗位">
-          <el-select
-            v-model="search.jobs"
-            clearable
-            style="width: 100%"
-            filterable
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="(item, index) in postType"
-              :key="index"
-              :label="item.postName"
-              :value="item.postNo"
-            >
+          <el-select v-model="search.jobs" clearable style="width: 100%" filterable collapse-tags size="small">
+            <el-option v-for="(item, index) in postType" :key="index" :label="item.postName" :value="item.postNo">
             </el-option>
           </el-select>
         </el-form-item>
@@ -64,7 +27,14 @@
         <!--          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称" style="width: 200px"></el-input>-->
         <!--        </el-form-item>-->
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="search.entrTime"
             type="daterange"
             range-separator="至"
@@ -75,26 +45,13 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            size="mini"
-            :disable="disSearch"
-            @click="searchData"
-            >查询</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            type="info"
-            plain
-            size="mini"
-            :disable="disSearch"
-            @click="reset"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" size="mini" :disable="disSearch"
+            @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable="disSearch"
+            @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -102,491 +59,162 @@
       <el-row>
         <el-col :span="4">
           <div class="common-title-name">
-            <img
-              style="width: 25px; height: 25px"
-              src="../../../../assets/img/imgScreen/logo.png"
-            />
+            <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
             物料名称
           </div>
           <div class="common-table-div">
-            <el-table
-              ref="tableMain11"
-              :height="theight1"
-              v-loading="tableLoading11"
-              :data="tableData11"
-              highlight-current-row
-              @row-click="handleCurrentChange"
-              :header-cell-style="tableHeaderCellStyle"
-              :summary-method="getSummaries11"
-              show-summary
-              border
-              style="width: 100%"
-              :icorePanelShown="100"
-              :icore-filter-flag="icoreFilterFlag"
-            >
-              <el-table-column
-                sortable
-                show-overflow-tooltip
-                align="center"
-                min-width="100"
-                prop="MAT_NAME"
-                label="物料名称"
-              ></el-table-column>
+            <el-table ref="tableMain11" :height="theight1" v-loading="tableLoading11" :data="tableData11"
+              highlight-current-row @row-click="handleCurrentChange" :header-cell-style="tableHeaderCellStyle"
+              :summary-method="getSummaries11" show-summary border style="width: 100%" :icorePanelShown="100"
+              :icore-filter-flag="icoreFilterFlag">
+              <el-table-column sortable show-overflow-tooltip align="center" min-width="100" prop="MAT_NAME"
+                label="物料名称"></el-table-column>
             </el-table>
           </div>
         </el-col>
         <el-col :span="20">
           <el-tabs type="border-card" v-model="activeName">
             <el-tab-pane label="任务未分配" name="first">
-              <span slot="label"
-                >任务未分配<el-badge
-                  :max="10"
-                  :hidden="total == 0"
-                  style="margin-top: -18px"
-                  :value="total"
-                ></el-badge
-              ></span>
+              <span slot="label">任务未分配<el-badge :max="10" :hidden="total == 0" style="margin-top: -18px"
+                  :value="total"></el-badge></span>
               <div class="common-title-div">
                 <div class="common-title-name">
-                  <img
-                    style="width: 25px; height: 25px"
-                    src="../../../../assets/img/imgScreen/logo.png"
-                  />
+                  <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
                   任务未分配
                 </div>
                 <div>
-                  <el-button
-                    icon="el-icon-check"
-                    type="goon"
-                    size="mini"
-                    v-privilege="activeMenu + 'distribution'"
-                    @click="checkAllot"
-                    >分配</el-button
-                  >
-                  <el-button
-                    icon="el-icon-check"
-                    type="goon"
-                    size="mini"
-                    :loading="recipientsLoading"
-                    v-privilege="activeMenu + 'recipients'"
-                    @click="recipients"
-                    >领用</el-button
-                  >
+                  <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'distribution'"
+                    @click="checkAllot">分配</el-button>
+                  <el-button icon="el-icon-check" type="goon" size="mini" :loading="recipientsLoading"
+                    v-privilege="activeMenu + 'recipients'" @click="recipients">领用</el-button>
                   <!--          <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini" v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>-->
                   <!--          <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'"  @click="recoverData">启用</el-button>-->
                 </div>
               </div>
               <div class="common-table-div">
-                <el-table
-                  v-loading="tableLoading1"
-                  ref="dataTable"
-                  border
-                  :height="tableTop"
-                  highlight-current-row
-                  @selection-change="handleSelectionChange"
-                  :data="tableData1"
-                  :row-class-name="tableRowClassName"
-                  :icore-filter-flag="icoreFilterFlag"
-                  :header-cell-style="tableHeaderCellStyle"
-                  :summary-method="getSummaries2"
-                  show-summary
-                >
-                  <el-table-column
-                    type="index"
-                    label="NO"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center"
-                  ></el-table-column>
+                <el-table v-loading="tableLoading1" ref="dataTable" border :height="tableTop" highlight-current-row
+                  @selection-change="handleSelectionChange" :data="tableData1" :row-class-name="tableRowClassName"
+                  :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+                  :summary-method="getSummaries2" show-summary>
+                  <el-table-column type="index" label="NO" align="center"></el-table-column>
+                  <el-table-column type="selection" width="55" align="center"></el-table-column>
                   <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column> -->
-                  <el-table-column
-                    :show-overflow-tooltip="true"
-                    sortable
-                    min-width="150px"
-                    prop="typeName"
-                    label="中心编号"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="150px"
-                    prop="carNo"
-                    label="委托编号"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column :show-overflow-tooltip="true" sortable min-width="150px" prop="typeName" label="中心编号"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="150px" prop="carNo" label="委托编号"
+                    align="center"></el-table-column>
                   <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="tkId" label="任务编号" align="center"></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="matName"
-                    label="物料名称"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称"
+                    align="center"></el-table-column>
                   <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="120px"
-                    prop="testItemName"
-                    label="任务名称"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="80px"
-                    prop="itemTypeName"
-                    label="任务类型"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="80px"
-                    prop="validFlagName"
-                    label="数据状态"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="memo"
-                    label="备注"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName"
+                    label="任务名称"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="itemTypeName"
+                    label="任务类型" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName"
+                    label="数据状态" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+                    align="center"></el-table-column>
                   <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="testLimit"
-                    label="任务时限"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="taskDate"
-                    label="任务日期"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="receivedDate"
-                    label="收样日期"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="testPostName"
-                    label="岗位名称"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="eqpTypeName"
-                    label="设备"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="95px"
-                    prop="createMan"
-                    label="创建人"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="createTime"
-                    label="创建时间"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="95px"
-                    prop="updateMan"
-                    label="修改人"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="updateTime"
-                    label="修改时间"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit"
+                    label="任务时限" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="receivedDate"
+                    label="收样日期" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName"
+                    label="岗位名称" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName"
+                    label="设备" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime"
+                    label="创建时间" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime"
+                    label="修改时间" align="center"></el-table-column>
                 </el-table>
               </div>
               <!-- 分页一 -->
               <div class="common-foot-style">
-                <el-pagination
-                  @size-change="pageSizeChange"
-                  @current-change="pageCurrentChange"
-                  :current-page="pageIndex"
-                  :page-sizes="[100, 200, 500, 800, 1000]"
-                  :page-size="pageSize"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :total="total"
-                  background
-                >
+                <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
+                  :current-page="pageIndex" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper" :total="total" background>
                 </el-pagination>
               </div>
             </el-tab-pane>
             <el-tab-pane label="任务已分配" name="second">
-              <span slot="label"
-                >任务已分配<el-badge
-                  :max="10"
-                  :hidden="totalDep == 0"
-                  style="margin-top: -18px"
-                  :value="totalDep"
-                ></el-badge
-              ></span>
+              <span slot="label">任务已分配<el-badge :max="10" :hidden="totalDep == 0" style="margin-top: -18px"
+                  :value="totalDep"></el-badge></span>
               <div class="common-title-div">
                 <div class="common-title-name">
-                  <img
-                    style="width: 25px; height: 25px"
-                    src="../../../../assets/img/imgScreen/logo.png"
-                  />
+                  <img style="width: 25px; height: 25px" src="../../../../assets/img/imgScreen/logo.png" />
                   任务已分配
                 </div>
                 <div>
-                  <el-button
-                    icon="el-icon-circle-close"
-                    type="danger"
-                    :loading="buttonLoading3"
-                    size="mini"
-                    v-privilege="activeMenu + 'Unassign'"
-                    @click="cancel"
-                    >取消分配</el-button
-                  >
+                  <el-button icon="el-icon-circle-close" type="danger" :loading="buttonLoading3" size="mini"
+                    v-privilege="activeMenu + 'Unassign'" @click="cancel">取消分配</el-button>
                 </div>
               </div>
               <div class="common-table-div">
-                <el-table
-                  v-loading="tableLoading2"
-                  ref="dataTable2"
-                  border
-                  :height="tableBot"
-                  highlight-current-row
-                  @selection-change="handleSelectionChange2"
-                  :data="tableData2"
-                  :row-class-name="tableRowClassName2"
-                  :icore-filter-flag="icoreFilterFlag"
-                  :header-cell-style="tableHeaderCellStyle"
-                  :summary-method="getSummaries2"
-                  show-summary
-                >
-                  <el-table-column
-                    type="index"
-                    label="NO"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center"
-                  ></el-table-column>
+                <el-table v-loading="tableLoading2" ref="dataTable2" border :height="tableBot" highlight-current-row
+                  @selection-change="handleSelectionChange2" :data="tableData2" :row-class-name="tableRowClassName2"
+                  :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+                  :summary-method="getSummaries2" show-summary>
+                  <el-table-column type="index" label="NO" align="center"></el-table-column>
+                  <el-table-column type="selection" width="55" align="center"></el-table-column>
                   <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="80px"
-                    prop="carNo"
-                    label="委托编号"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    :show-overflow-tooltip="true"
-                    sortable
-                    min-width="100px"
-                    prop="typeName"
-                    label="中心编号"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="carNo" label="委托编号"
+                    align="center"></el-table-column>
+                  <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="typeName" label="中心编号"
+                    align="center"></el-table-column>
                   <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="任务编号" align="center"></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="140px"
-                    prop="taskDate"
-                    label="任务日期"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="receivedDate"
-                    label="收样日期"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="matName"
-                    label="物料名称"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="taskDate" label="任务日期"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="receivedDate"
+                    label="收样日期" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="matName" label="物料名称"
+                    align="center"></el-table-column>
                   <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column> -->
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="120px"
-                    prop="testItemName"
-                    label="任务名称"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="itemTypeName"
-                    label="任务类型"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="optName"
-                    label="执行人"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="stdName"
-                    label="标准号"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="pointName"
-                    label="地点"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="testLimit"
-                    label="任务时限"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="testPostName"
-                    label="岗位"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="eqpTypeName"
-                    label="设备"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="140px"
-                    prop="deptName"
-                    label="部门名称"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="sectionName"
-                    label="班组名称"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="80px"
-                    prop="validFlagName"
-                    label="数据状态"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="100px"
-                    prop="memo"
-                    label="备注"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="95px"
-                    prop="createMan"
-                    label="创建人"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="createTime"
-                    label="创建时间"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="95px"
-                    prop="updateMan"
-                    label="修改人"
-                    align="center"
-                  ></el-table-column>
-                  <el-table-column
-                    sortable
-                    :show-overflow-tooltip="true"
-                    min-width="160px"
-                    prop="updateTime"
-                    label="修改时间"
-                    align="center"
-                  ></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName"
+                    label="任务名称" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="itemTypeName"
+                    label="任务类型" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="optName" label="执行人"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit"
+                    label="任务时限" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName"
+                    label="岗位" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName"
+                    label="设备" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="deptName" label="部门名称"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName"
+                    label="班组名称" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName"
+                    label="数据状态" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime"
+                    label="创建时间" align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+                    align="center"></el-table-column>
+                  <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime"
+                    label="修改时间" align="center"></el-table-column>
                 </el-table>
               </div>
               <div class="common-foot-style">
-                <el-pagination
-                  @size-change="pageSizeChange2"
-                  @current-change="pageCurrentChange2"
-                  :current-page="pageIndex_dep"
-                  :page-sizes="[100, 200, 500, 800, 1000]"
-                  :page-size="pageSize_dep"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :total="totalDep"
-                  background
-                >
+                <el-pagination @size-change="pageSizeChange2" @current-change="pageCurrentChange2"
+                  :current-page="pageIndex_dep" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="pageSize_dep"
+                  layout="total, sizes, prev, pager, next, jumper" :total="totalDep" background>
                 </el-pagination>
               </div>
             </el-tab-pane>
@@ -594,123 +222,46 @@
         </el-col>
       </el-row>
     </div>
-    <el-dialog
-      @close="closeDialog"
-      :visible.sync="dialogTableVisible"
-      width="70%"
-    >
+    <el-dialog @close="closeDialog" :visible.sync="dialogTableVisible" width="70%">
       <div slot="title">
         <i class="el-icon-document" style="font-size: 20px"></i>
         <span style="margin-left: 10px; font-size: 18px">选择人员</span>
       </div>
       <el-form :inline="true" @submit.native.prevent>
         <el-form-item label="人员编号">
-          <el-input
-            v-model="form.empNo"
-            size="small"
-            @keyup.enter.native="searchAllot()"
-            placeholder="请输入搜索条件"
-            style="width: 200px"
-          ></el-input>
+          <el-input v-model="form.empNo" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="人员名称">
-          <el-input
-            v-model="form.empName"
-            size="small"
-            @keyup.enter.native="searchAllot()"
-            placeholder="请输入搜索条件"
-            style="width: 200px"
-          ></el-input>
+          <el-input v-model="form.empName" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            @click="searchAllot"
-            size="mini"
-            >查询</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" @click="searchAllot" size="mini">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="allotLoading"
-        ref="dataTable"
-        border
-        height="300"
-        highlight-current-row
-        @row-click="handleAllot"
-        :data="allotData"
-        :icore-filter-flag="icoreFilterFlag"
-        :header-cell-style="tableHeaderCellStyle"
-        :summary-method="getSummaries2"
-        show-summary
-      >
-        <el-table-column
-          type="index"
-          label="NO"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          sortable
-          :show-overflow-tooltip="true"
-          min-width="100px"
-          prop="empNo"
-          label="人员编号"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          sortable
-          :show-overflow-tooltip="true"
-          min-width="80px"
-          prop="empName"
-          label="人员姓名"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          sortable
-          :show-overflow-tooltip="true"
-          min-width="120px"
-          prop="deptName"
-          label="部门"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          sortable
-          :show-overflow-tooltip="true"
-          min-width="120px"
-          prop="wrkGrpName"
-          label="班组"
-          align="center"
-        ></el-table-column>
+      <el-table v-loading="allotLoading" ref="dataTable" border height="300" highlight-current-row
+        @row-click="handleAllot" :data="allotData" :icore-filter-flag="icoreFilterFlag"
+        :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
+        <el-table-column type="index" label="NO" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="empNo" label="人员编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="empName" label="人员姓名"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="deptName" label="部门"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="wrkGrpName" label="班组"
+          align="center"></el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="pageSizeAllot"
-          @current-change="pageCurrentAllot"
-          :current-page="allotIndex"
-          :page-sizes="[100, 200, 500]"
-          :page-size="allotPage"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="allotTotal"
-          background
-        >
+        <el-pagination @size-change="pageSizeAllot" @current-change="pageCurrentAllot" :current-page="allotIndex"
+          :page-sizes="[100, 200, 500]" :page-size="allotPage" layout="total, sizes, prev, pager, next, jumper"
+          :total="allotTotal" background>
         </el-pagination>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="goon"
-          size="mini"
-          icon="el-icon-check"
-          @click="allocation()"
-          >确定</el-button
-        >
-        <el-button
-          size="mini"
-          type="goon"
-          icon="el-icon-remove-outline"
-          @click="cancelData"
-          >取消</el-button
-        >
+        <el-button type="goon" size="mini" icon="el-icon-check" @click="allocation()">确定</el-button>
+        <el-button size="mini" type="goon" icon="el-icon-remove-outline" @click="cancelData">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -1177,8 +728,8 @@ export default {
         list: this.search.sectionNo
           ? [this.search.sectionNo]
           : this.sectionNo
-          ? [this.sectionNo]
-          : [],
+            ? [this.sectionNo]
+            : [],
         mode: this.search.jobs ? this.search.jobs : this.classNo,
         pageIndex: this.pageIndex,
         pageSize: this.pageSize,
@@ -1202,14 +753,14 @@ export default {
                 item.validFlag == 0
                   ? "无效"
                   : item.validFlag == 1
-                  ? "有效"
-                  : "";
+                    ? "有效"
+                    : "";
               item.stateFlagName =
                 item.stateFlag == 0
                   ? "未分配"
                   : item.stateFlag == 1
-                  ? "已分配"
-                  : "";
+                    ? "已分配"
+                    : "";
               item.isAutoName =
                 item.isAuto == 0 ? "手动" : item.isAuto == 1 ? "自动" : "";
             });
@@ -1246,8 +797,8 @@ export default {
         list: this.search.sectionNo
           ? [this.search.sectionNo]
           : this.sectionNo
-          ? [this.sectionNo]
-          : [],
+            ? [this.sectionNo]
+            : [],
         mode: this.search.jobs ? this.search.jobs : this.classNo,
         pageIndex: this.pageIndex_dep,
         pageSize: this.pageSize_dep,
@@ -1271,14 +822,14 @@ export default {
                 item.validFlag == 0
                   ? "无效"
                   : item.validFlag == 1
-                  ? "有效"
-                  : "";
+                    ? "有效"
+                    : "";
               item.stateFlagName =
                 item.stateFlag == 0
                   ? "未分配"
                   : item.stateFlag == 1
-                  ? "已分配"
-                  : "";
+                    ? "已分配"
+                    : "";
               item.isAutoName =
                 item.isAuto == 0 ? "手动" : item.isAuto == 1 ? "自动" : "";
             });

src/views/taskManagement/components/taskAllocationProduct/taskAllocationProduct.vue

@@ -1,60 +1,41 @@
-
 <!-- 任务分配(成品)页面 -->
 <template>
   <div class="examination">
     <div class="common-head-search">
       <el-form :inline='true'>
         <el-form-item label="检验车间">
-          <el-select
-            v-model="search.deptNo"
-            filterable
-            clearable
-            style="width:100%"
-            collapse-tags
-            @clear='clearSelect'
-            @change="selectClass"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionNameType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.deptNo" filterable clearable style="width:100%" collapse-tags @clear='clearSelect'
+            @change="selectClass" size="small">
+            <el-option v-for="item in sectionNameType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验班组">
-          <el-select
-            v-model="search.sectionNo"
-            filterable
-            clearable
-            @change="selectSection"
-            style="width:100%"
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionClassType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="search.sectionNo" filterable clearable @change="selectSection" style="width:100%"
+            collapse-tags size="small">
+            <el-option v-for="item in sectionClassType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="岗位">
-          <el-select v-model="search.jobs" clearable  style="width:100%" filterable collapse-tags size="small" >
-            <el-option v-for="(item,index) in postType" :key="index" :label="item.postName"
-              :value="item.postNo">
+          <el-select v-model="search.jobs" clearable style="width:100%" filterable collapse-tags size="small">
+            <el-option v-for="(item, index) in postType" :key="index" :label="item.postName" :value="item.postNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称" style="width: 200px"></el-input>
+          <el-input v-model="search.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="任务日期">
-          <el-date-picker
+          <el-date-picker v-model="search.entrTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.entrTime[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="search.entrTime"
            type="daterange"
            range-separator="至"
@@ -64,139 +45,163 @@
            style="width:300px"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button icon="el-icon-search" type="goon" size="mini" :disable='disSearch' @click="searchData">查询</el-button>
-          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable='disSearch' @click="reset">重置</el-button>
+          <el-button icon="el-icon-search" type="goon" size="mini" :disable='disSearch'
+            @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable='disSearch'
+            @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <el-tabs type="border-card" v-model="activeName">
       <el-tab-pane label="任务未分配" name="first">
-        <span slot="label">任务未分配<el-badge :max="10" :hidden='total == 0' style="margin-top:-18px" :value="total"></el-badge></span>
+        <span slot="label">任务未分配<el-badge :max="10" :hidden='total == 0' style="margin-top:-18px"
+            :value="total"></el-badge></span>
         <div class="common-title-div">
           <div class="common-title-name">
             <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
             任务未分配
           </div>
           <div>
-          <el-button icon="el-icon-check"  type="goon" size="mini" v-privilege="activeMenu + 'distribution'" @click="checkAllot">分配</el-button>
-          <el-button icon="el-icon-check"  type="goon" size="mini" :loading='recipientsLoading' v-privilege="activeMenu + 'recipients'"  @click="recipients">领用</el-button>
-<!--          <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini" v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>-->
-<!--          <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'"  @click="recoverData">启用</el-button>-->
+            <el-button icon="el-icon-check" type="goon" size="mini" v-privilege="activeMenu + 'distribution'"
+              @click="checkAllot">分配</el-button>
+            <el-button icon="el-icon-check" type="goon" size="mini" :loading='recipientsLoading'
+              v-privilege="activeMenu + 'recipients'" @click="recipients">领用</el-button>
+            <!--          <el-button icon="el-icon-circle-close" :loading="buttonLoading1" type="danger" size="mini" v-privilege="activeMenu + 'disable'" @click="deleteData">停用</el-button>-->
+            <!--          <el-button icon="el-icon-check" :loading="buttonLoading2" type="goon" size="mini" v-privilege="activeMenu + 'effectivity'"  @click="recoverData">启用</el-button>-->
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-           <el-table
-           v-loading="tableLoading1" ref="dataTable" border :height="tableTop"
-           highlight-current-row
-           @selection-change="handleSelectionChange"
-           :data="tableData1"
-           :row-class-name="tableRowClassName"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading1" ref="dataTable" border :height="tableTop" highlight-current-row
+            @selection-change="handleSelectionChange" :data="tableData1" :row-class-name="tableRowClassName"
+            :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" align="center"></el-table-column>
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="150px" prop="carNo" label="委托编号" align="center" ></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="150px" prop="carNo" label="委托编号"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="batchNo" label="批次号" align="center"></el-table-column> -->
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="150px" prop="sampleNo" label="中心编号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="150px" prop="sampleNo" label="中心编号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="gradeName" label="牌号" align="center"></el-table-column> -->
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column> -->
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='testItemName' label="任务名称"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="itemTypeName" label="任务类型"  align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='testItemName'
+              label="任务名称"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column> -->
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点名称"  align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位名称" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态" align="center" ></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDeptName" label="计划车间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDeptName" label="计划车间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <!-- 分页一 -->
         <div class="common-foot-style">
-          <el-pagination
-          @size-change="pageSizeChange"
-          @current-change="pageCurrentChange"
-          :current-page="pageIndex"
-          :page-sizes="[100, 200, 500, 800, 1000]"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total" background>
+          <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange" :current-page="pageIndex"
+            :page-sizes="[100, 200, 500, 800, 1000]" :page-size="pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" background>
           </el-pagination>
         </div>
       </el-tab-pane>
       <el-tab-pane label="任务已分配" name="second">
-        <span slot="label">任务已分配<el-badge :max="10" :hidden='totalDep == 0' style="margin-top:-18px" :value="totalDep"></el-badge></span>
+        <span slot="label">任务已分配<el-badge :max="10" :hidden='totalDep == 0' style="margin-top:-18px"
+            :value="totalDep"></el-badge></span>
         <div class="common-title-div">
           <div class="common-title-name">
             <img style="width: 25px; height: 25px" src='../../../../assets/img/imgScreen/logo.png' />
             任务已分配
           </div>
           <div>
-          <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini" v-privilege="activeMenu + 'Unassign'" @click="cancel">取消分配</el-button>
+            <el-button icon="el-icon-circle-close" type="danger" :loading='buttonLoading3' size="mini"
+              v-privilege="activeMenu + 'Unassign'" @click="cancel">取消分配</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-          <el-table
-           v-loading="tableLoading2" ref="dataTable2" border :height="tableBot"
-           highlight-current-row
-            @selection-change="handleSelectionChange2"
-           :data="tableData2"
-           :row-class-name="tableRowClassName2"
-           :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"
-           :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading2" ref="dataTable2" border :height="tableBot" highlight-current-row
+            @selection-change="handleSelectionChange2" :data="tableData2" :row-class-name="tableRowClassName2"
+            :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" align="center"></el-table-column>
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="stateFlagName" label="是否分配" align="center" ></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="isAutoName" label="分配类型" align="center" ></el-table-column> -->
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="carNo" label="委托编号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleNo" label="中心编号" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDeptName" label="计划车间" align="center"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="gradeName" label="牌号" align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="carNo" label="委托编号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="sampleNo" label="中心编号"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="matName" label="物料名称"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="planDeptName" label="计划车间"
+              align="center"></el-table-column>
+            <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="gradeName" label="牌号"
+              align="center"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="taskDate" label="任务日期" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="taskDate" label="任务日期"
+              align="center"></el-table-column>
             <!-- <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop='matOrder' label="物料顺序"></el-table-column> -->
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName" label="任务名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="itemTypeName" label="任务类型"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="optName" label="执行人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点"  align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="deptName" label="部门名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="班组名称" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态" align="center" ></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人" align="center"></el-table-column>
-            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间" align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="testItemName" label="任务名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="itemTypeName" label="任务类型"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="optName" label="执行人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="stdName" label="标准号"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="pointName" label="地点"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testLimit" label="任务时限"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="testPostName" label="岗位"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="eqpTypeName" label="设备"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="deptName" label="部门名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="sectionName" label="班组名称"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlagName" label="数据状态"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="createMan" label="创建人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="createTime" label="创建时间"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="95px" prop="updateMan" label="修改人"
+              align="center"></el-table-column>
+            <el-table-column sortable :show-overflow-tooltip="true" min-width="160px" prop="updateTime" label="修改时间"
+              align="center"></el-table-column>
           </el-table>
         </div>
         <div class="common-foot-style">
-          <el-pagination
-          @size-change="pageSizeChange2"
-          @current-change="pageCurrentChange2"
-          :current-page="pageIndex_dep"
-          :page-sizes="[100, 200, 500, 800, 1000]"
-          :page-size="pageSize_dep"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="totalDep" background>
+          <el-pagination @size-change="pageSizeChange2" @current-change="pageCurrentChange2"
+            :current-page="pageIndex_dep" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="pageSize_dep"
+            layout="total, sizes, prev, pager, next, jumper" :total="totalDep" background>
           </el-pagination>
         </div>
       </el-tab-pane>
@@ -208,40 +213,36 @@
       </div>
       <el-form :inline='true' @submit.native.prevent>
         <el-form-item label="人员编号">
-          <el-input v-model="form.empNo" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件" style="width: 200px"></el-input>
+          <el-input v-model="form.empNo" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="人员名称">
-          <el-input v-model="form.empName" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件" style="width: 200px"></el-input>
+          <el-input v-model="form.empName" size="small" @keyup.enter.native="searchAllot()" placeholder="请输入搜索条件"
+            style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" @click="searchAllot" size="mini">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-      v-loading="allotLoading" ref="dataTable" border height="300"
-       highlight-current-row
-       @row-click='handleAllot'
-       :data="allotData"
-       :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle"
-       :summary-method="getSummaries2" show-summary>
+      <el-table v-loading="allotLoading" ref="dataTable" border height="300" highlight-current-row
+        @row-click='handleAllot' :data="allotData" :icore-filter-flag="icoreFilterFlag"
+        :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2" show-summary>
         <el-table-column type="index" label="NO" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="empNo" label="人员编号" align="center" ></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="empName" label="人员姓名" align="center" ></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="deptName" label="部门" align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="wrkGrpName" label="班组" align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="empNo" label="人员编号"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="empName" label="人员姓名"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="deptName" label="部门"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="wrkGrpName" label="班组"
+          align="center"></el-table-column>
       </el-table>
       <div>
-          <el-pagination
-          @size-change="pageSizeAllot"
-          @current-change="pageCurrentAllot"
-          :current-page="allotIndex"
-          :page-sizes="[100, 200,500]"
-          :page-size="allotPage"
-          layout="total, sizes, prev, pager, next, jumper"
+        <el-pagination @size-change="pageSizeAllot" @current-change="pageCurrentAllot" :current-page="allotIndex"
+          :page-sizes="[100, 200, 500]" :page-size="allotPage" layout="total, sizes, prev, pager, next, jumper"
           :total="allotTotal" background>
-          </el-pagination>
-        </div>
+        </el-pagination>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="goon" size="mini" icon="el-icon-check" @click="allocation()">确定</el-button>
         <el-button size="mini" type="goon" icon="el-icon-remove-outline" @click="cancelData">取消</el-button>
@@ -250,7 +251,7 @@
   </div>
 </template>
 <script>
-import {getCookie ,formatDate, isStartEndDate,} from '@/utils/util.js';
+import { getCookie, formatDate, isStartEndDate, } from '@/utils/util.js';
 import {
   cookieUserId,
   cookieUserName
@@ -258,80 +259,80 @@ import {
 let userName = getCookie(cookieUserName);
 let userId = getCookie(cookieUserId);
 export default {
-  data () {
+  data() {
     return {
       icoreFilterFlag: true,
-      dialogTableVisible:false,
-      activeName:'first',
+      dialogTableVisible: false,
+      activeName: 'first',
       taskId: '',
       testItemNo: '',
-      form:{
-        empNo:'',
-        empName:''
+      form: {
+        empNo: '',
+        empName: ''
       },
-      jobType:[],
-      postType:[],
-      allotIndex:1,
-      allotPage:100,
-      allotTotal:0,
-      allotLoading:false,
+      jobType: [],
+      postType: [],
+      allotIndex: 1,
+      allotPage: 100,
+      allotTotal: 0,
+      allotLoading: false,
       search: {
         mode: '',
-        deptNo:'',
-        sectionNo:'',
-        entrTime:[],
-        itemTypeName:'',
+        deptNo: '',
+        sectionNo: '',
+        entrTime: [],
+        itemTypeName: '',
         jobs: ''
       },
-      disSearch:false,
-      classNo:'',
-      deptNo:'',
-      sectionNo:'',
-      allotData:[],
-      clickAllot:{},
-      tableData1:[],
-      tableData2:[],
-      tableData3:[],
-      tableLoading1:false,
-      tableLoading2:false,
-      tableLoading3:false,
-      recipientsLoading:false,
-      buttonLoading1:false,
-      buttonLoading2:false,
-      buttonLoading3:false,
-      buttonLoading4:false,
-      itemType:[],
+      disSearch: false,
+      classNo: '',
+      deptNo: '',
+      sectionNo: '',
+      allotData: [],
+      clickAllot: {},
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      tableLoading1: false,
+      tableLoading2: false,
+      tableLoading3: false,
+      recipientsLoading: false,
+      buttonLoading1: false,
+      buttonLoading2: false,
+      buttonLoading3: false,
+      buttonLoading4: false,
+      itemType: [],
       selectMain: [],
       selectDep: [],
-      tableTop:0,
-      tableBot:0,
-      pageIndex:1,
-      pageSize:500,
-      total:0,
-      pageIndex_dep:1,
-      pageSize_dep:500,
-      totalDep:0,
-      sectionNameType:[],
-      sectionClassType:[],
-      companyNameType:[],
-      activeMenu:''
+      tableTop: 0,
+      tableBot: 0,
+      pageIndex: 1,
+      pageSize: 500,
+      total: 0,
+      pageIndex_dep: 1,
+      pageSize_dep: 500,
+      totalDep: 0,
+      sectionNameType: [],
+      sectionClassType: [],
+      companyNameType: [],
+      activeMenu: ''
     }
   },
   created() {
     this.tableTop = window.innerHeight - 230;
     this.tableBot = window.innerHeight - 230;
-    this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+    this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
-    this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList',{}, {individualType: 'json'}).then(res =>{
+    this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList', {}, { individualType: 'json' }).then(res => {
       this.jobType = res.data
     })
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{},{ individualType: "json" }).then((response) => {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: "json" }).then((response) => {
       this.companyNameType = response.data;
       // this.getCompany()
       this.selectDepartment('JCZX')
     });
   },
-   mounted () {
+  mounted() {
     this.searchAllot()
     this.addScreen();
     this.addScreen2();
@@ -386,10 +387,10 @@ export default {
         }
       });
     },
-    clearSelect(){
+    clearSelect() {
       this.search.sectionNo = '';
-      this.search.jobs=''
-      this.postType=''
+      this.search.jobs = ''
+      this.postType = ''
     },
     //根据选中的部门名称，查询班组名称
     selectClass(val) {
@@ -401,81 +402,81 @@ export default {
         }
       });
     },
-  //根据选中的部门名称，查询班组名称
-  selectClass2(val) {
-    this.sectionClassType = [];
-    this.sectionNameType.find((item) => {
-      if (val === item.orgCode) {
-        this.sectionClassType = item.sysOrgList;
-        // this.search.sectionNo = '';
-      }
-    });
-  },
-    selectPost(val){
-      this.postType=[]
-      this.jobType.forEach(item=>{
-        if (val === item.sectionNo){
+    //根据选中的部门名称，查询班组名称
+    selectClass2(val) {
+      this.sectionClassType = [];
+      this.sectionNameType.find((item) => {
+        if (val === item.orgCode) {
+          this.sectionClassType = item.sysOrgList;
+          // this.search.sectionNo = '';
+        }
+      });
+    },
+    selectPost(val) {
+      this.postType = []
+      this.jobType.forEach(item => {
+        if (val === item.sectionNo) {
           this.postType.push(item)
         }
       })
     },
-    selectSection(val){
-      this.search.jobs=''
+    selectSection(val) {
+      this.search.jobs = ''
       this.selectPost(val)
     },
-    closeDialog(){
+    closeDialog() {
       this.clickAllot = {}
-      this.form ={
-        empNo:'',
-        empName:''
+      this.form = {
+        empNo: '',
+        empName: ''
       }
       this.searchAllot()
     },
-    cancelData(){
+    cancelData() {
       this.clickAllot = {}
-      this.form ={
-        empNo:'',
-        empName:''
+      this.form = {
+        empNo: '',
+        empName: ''
       },
-      this.searchAllot()
+        this.searchAllot()
       this.dialogTableVisible = false
     },
-    searchAllot(){
+    searchAllot() {
       this.allotIndex = 1
       this.allotPage = 100
       this.dataAllot()
     },
-    dataAllot(){
+    dataAllot() {
       this.clickAllot = {}
       this.allotLoading = true
       let obj = {
-        object:{
-          empNo:this.form.empNo,
-          empName:this.form.empName,
-          validFlag:1
+        object: {
+          empNo: this.form.empNo,
+          empName: this.form.empName,
+          validFlag: 1
         },
-        pageIndex:this.allotIndex,
-        pageSize:this.allotPage
+        pageIndex: this.allotIndex,
+        pageSize: this.allotPage
       }
-      this.axios.post('pass/baseManagement/v1/limslrcemps/queryEmpPagesDS', obj, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/baseManagement/v1/limslrcemps/queryEmpPagesDS', obj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.allotData = res.data.list;
           this.allotTotal = res.data.total
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.allotLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.allotLoading = false
         this.$message.error(err.message);
       })
     },
-    checkAllot(){
+    checkAllot() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要分配的数据')
         return
       }
-      for(let item of this.selectMain){
+      for (let item of this.selectMain) {
         if (item.validFlag == 0) {
           this.$message.warning('已停用的数据不可进行分配')
           return
@@ -484,8 +485,8 @@ export default {
       this.dialogTableVisible = true
     },
     //获取个人所属哪个公司
-    getCompany(){
-      this.axios.get('pass/baseManagement/v1/limslrcemps/'+userId).then(res =>{
+    getCompany() {
+      this.axios.get('pass/baseManagement/v1/limslrcemps/' + userId).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.search.deptNo = res.data ? res.data.deptNo : ''
           this.search.sectionNo = res.data ? res.data.sectionNo : ''
@@ -496,50 +497,50 @@ export default {
           this.selectClass2(this.search.deptNo)
           this.selectPost(this.search.sectionNo);
           this.searchData()
-        }else{
+        } else {
           this.disSearch = true
           this.$message.error(e.message)
         }
-      }).catch(e =>{
+      }).catch(e => {
         this.disSearch = true
         this.$message.error(e.message)
       })
     },
     ///分配
-    allocation(){
-      if (JSON.stringify(this.clickAllot)==="{}") {
+    allocation() {
+      if (JSON.stringify(this.clickAllot) === "{}") {
         this.$message.warning('请先点击选中一条数据')
         return
       }
       let newList = []
       newList = JSON.parse(JSON.stringify(this.selectMain))
-      newList.forEach(item =>{
+      newList.forEach(item => {
         item.optNo = this.clickAllot.empNo,
-        item.optName =this.clickAllot.empName,
-        item.deptNo = this.clickAllot.deptNo,
-        item.deptName = this.clickAllot.deptName,
-        item.sectionNo = this.clickAllot.sectionNo,
-        item.sectionName = this.clickAllot.sectionName
+          item.optName = this.clickAllot.empName,
+          item.deptNo = this.clickAllot.deptNo,
+          item.deptName = this.clickAllot.deptName,
+          item.sectionNo = this.clickAllot.sectionNo,
+          item.sectionName = this.clickAllot.sectionName
       })
-      this.axios.post('pass/testManagement/v1/limstasktests/assign',newList, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.dialogTableVisible = false
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
-      }).catch(err =>{
+      }).catch(err => {
         this.$message.error(err.message);
       })
     },
     //领用
-    recipients(){
+    recipients() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要领用的数据')
         return
       }
-      for(let item of this.selectMain){
+      for (let item of this.selectMain) {
         if (item.validFlag == 0) {
           this.$message.warning('已停用的数据不可进行领用')
           return
@@ -548,70 +549,70 @@ export default {
       let newList = []
       newList = JSON.parse(JSON.stringify(this.selectMain))
       this.recipientsLoading = true
-      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/assign', newList, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.recipientsLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.recipientsLoading = false
         this.$message.error(err.message);
       })
     },
     // 终止
-    deleteData () {
+    deleteData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要停用的数据')
         return
       }
       this.buttonLoading1 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/abolish', this.selectMain, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/abolish', this.selectMain, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading1 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading1 = false
         this.$message.error(err.message);
       })
     },
     // 恢复
-    recoverData () {
+    recoverData() {
       if (this.selectMain.length < 1) {
         this.$message.warning('请勾选您要启用的数据')
         return
       }
       this.buttonLoading2 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/recover', this.selectMain, {individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limstasktests/recover', this.selectMain, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading2 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading2 = false
         this.$message.error(err.message);
       })
     },
     // 查询
-    searchData(){
+    searchData() {
       this.selectMain = []
       this.pageIndex = 1
       this.pageSize = 100
       this.dataMain()
       this.dataDep()
     },
-    dataMain () {
+    dataMain() {
       this.tableLoading1 = true
-      let startTime =''
+      let startTime = ''
       let endTime = ''
       if (!this.search.entrTime) {
         startTime = ''
@@ -621,21 +622,21 @@ export default {
         endTime = this.search.entrTime[1] + ' 23:59:59'
       }
       let tempobj = {
-        'object':{
-          'itemTypeName':this.search.itemTypeName,
+        'object': {
+          'itemTypeName': this.search.itemTypeName,
           'stateFlag': 0,
-          'sampleTypeCode':480103,
+          'sampleTypeCode': 480103,
         },
-        'mode3':this.search.matName,
-        'mode4':this.search.deptNo ? this.search.deptNo : this.deptNo,
+        'mode3': this.search.matName,
+        'mode4': this.search.deptNo ? this.search.deptNo : this.deptNo,
         'list': this.search.sectionNo ? [this.search.sectionNo] : this.sectionNo ? [this.sectionNo] : [],
         'mode': this.search.jobs ? this.search.jobs : this.classNo,
-        'pageIndex':this.pageIndex,
-        'pageSize':this.pageSize,
-        'startTime2':startTime,
-        'endTime2':endTime
+        'pageIndex': this.pageIndex,
+        'pageSize': this.pageSize,
+        'startTime2': startTime,
+        'endTime2': endTime
       }
-      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage',tempobj,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage', tempobj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData1 = res.data.list;
           this.total = res.data.total;
@@ -644,7 +645,7 @@ export default {
             item.stateFlagName = item.stateFlag == 0 ? '未分配' : item.stateFlag == 1 ? '已分配' : ''
             item.isAutoName = item.isAuto == 0 ? '手动' : item.isAuto == 1 ? '自动' : ''
           })
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading1 = false
@@ -653,9 +654,9 @@ export default {
         this.$message.error(e.message)
       });
     },
-    dataDep () {
+    dataDep() {
       this.tableLoading2 = true
-      let startTime =''
+      let startTime = ''
       let endTime = ''
       if (!this.search.entrTime) {
         startTime = ''
@@ -665,22 +666,22 @@ export default {
         endTime = this.search.entrTime[1] + ' 23:59:59'
       }
       let tempobj = {
-        'object':{
-          'itemTypeName':this.search.itemTypeName,
+        'object': {
+          'itemTypeName': this.search.itemTypeName,
           'stateFlag': 1,
-          'sampleTypeCode':480103,
-          'optNo':userId
+          'sampleTypeCode': 480103,
+          'optNo': userId
         },
-        'mode3':this.search.matName,
-        'mode4':this.search.deptNo ? this.search.deptNo : this.deptNo,
+        'mode3': this.search.matName,
+        'mode4': this.search.deptNo ? this.search.deptNo : this.deptNo,
         'list': this.search.sectionNo ? [this.search.sectionNo] : this.sectionNo ? [this.sectionNo] : [],
         'mode': this.search.jobs ? this.search.jobs : this.classNo,
-        'pageIndex':this.pageIndex_dep,
-        'pageSize':this.pageSize_dep,
-        'startTime2':startTime,
-        'endTime2':endTime
+        'pageIndex': this.pageIndex_dep,
+        'pageSize': this.pageSize_dep,
+        'startTime2': startTime,
+        'endTime2': endTime
       }
-      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage',tempobj,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/queryLimsTaskTestPage', tempobj, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData2 = res.data.list;
           this.totalDep = res.data.total;
@@ -689,7 +690,7 @@ export default {
             item.stateFlagName = item.stateFlag == 0 ? '未分配' : item.stateFlag == 1 ? '已分配' : ''
             item.isAutoName = item.isAuto == 0 ? '手动' : item.isAuto == 1 ? '自动' : ''
           })
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading2 = false
@@ -698,110 +699,109 @@ export default {
         this.$message.error(e.message)
       });
     },
-      // 重置
-    reset () {
+    // 重置
+    reset() {
       this.search.matName = '';
       this.search.jobs = ''
       this.search.deptNo = ''
       this.search.sectionNo = ''
-      this.search.entrTime= [this.getYNM(new Date()), this.getYNM(new Date())]
+      this.search.entrTime = [this.getYNM(new Date()), this.getYNM(new Date())]
       this.searchData();
     },
-     // 取消分配
-    cancel () {
+    // 取消分配
+    cancel() {
       if (this.selectDep.length < 1) {
         this.$message.warning('请勾选需要取消分配的数据')
         return
       }
       this.buttonLoading3 = true
-      this.axios.post('pass/testManagement/v1/limstasktests/unassign',this.selectDep, {individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limstasktests/unassign', this.selectDep, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message);
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message);
         }
         this.buttonLoading3 = false
-      }).catch(err =>{
+      }).catch(err => {
         this.buttonLoading3 = false
         this.$message.error(err.message);
       })
     },
-    pageSizeAllot (size) {
+    pageSizeAllot(size) {
       this.allotIndex = 1
       this.allotPage = size;
       this.dataAllot()
     },
-    pageCurrentAllot (index) {
+    pageCurrentAllot(index) {
       this.allotIndex = index;
       this.dataAllot()
     },
-    pageSizeChange (size) {
+    pageSizeChange(size) {
       this.pageIndex = 1
       this.pageSize = size;
       this.dataMain()
     },
-    pageCurrentChange (index) {
+    pageCurrentChange(index) {
       this.pageIndex = index;
       this.dataMain()
     },
-    pageSizeChange2 (size) {
+    pageSizeChange2(size) {
       this.pageIndex_dep = 1
       this.pageSize_dep = size;
       this.dataDep()
     },
-    pageCurrentChange2 (index) {
+    pageCurrentChange2(index) {
       this.pageIndex_dep = index;
       this.dataDep()
     },
     //勾选主表数据
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectMain = val;
     },
     //勾选人员表格数据
-    handleAllot (val) {
-      this.clickAllot = Object.assign({},val);
+    handleAllot(val) {
+      this.clickAllot = Object.assign({}, val);
     },
-    handleSelectionChange2 (val) {
+    handleSelectionChange2(val) {
       this.selectDep = val
     },
-    addScreen () {
+    addScreen() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
         if (this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0]) {
           this.$refs.dataTable.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
         }
-       });
+      });
     },
-     addScreen2 () {
+    addScreen2() {
       this.$nextTick(() => {
-          let ss = document.createElement('div');
-          ss.innerHTML = '筛选';
-          ss.style = 'text-align: center;'
+        let ss = document.createElement('div');
+        ss.innerHTML = '筛选';
+        ss.style = 'text-align: center;'
         if (this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0]) {
           this.$refs.dataTable2.$el.getElementsByClassName('el-table__fixed')[0].getElementsByTagName('td')[0].appendChild(ss);
         }
-       });
+      });
     },
-    tableRowClassName ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
     },
-    tableRowClassName2 ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName2({ row, column, rowIndex, columnIndex }) {
       if (row.validFlag !== '1') {
         return 'error-row';
       }
       return '';
     },
     // 表格上横线
-    tableHeaderCellStyle () {
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     }
   }
 }
 </script>
-<style scoped>
-</style>
+<style scoped></style>

src/views/testAnalysis/components/allWeighted.vue

@@ -38,7 +38,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="送样日期">
-          <el-date-picker
+          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="searchForm.times"
             type="daterange"
             range-separator="至"
@@ -49,7 +56,7 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button

src/views/testAnalysis/components/collectRecord.vue

@@ -2,29 +2,32 @@
 <template>
   <div class="examination">
     <div class="common-head-search">
-      <el-form  :inline="true" @submit.native.prevent ref="searchForm" :model="searchForm" class="demo-form-inline sui-search-form">
-        <el-form-item label='设备类型 '  prop="eqpTypeCode">
-          <el-select v-model="searchForm.eqpTypeCode" @change='selectFaclity' clearable @clear='cleareqpName' filterable collapse-tags size="small" style="width:150px;" placeholder="">
-            <el-option
-            v-for="item in facilityType"
-            :key="item.baseCode"
-            :label="item.baseName"
-            :value="item.baseCode">
+      <el-form :inline="true" @submit.native.prevent ref="searchForm" :model="searchForm"
+        class="demo-form-inline sui-search-form">
+        <el-form-item label='设备类型 ' prop="eqpTypeCode">
+          <el-select v-model="searchForm.eqpTypeCode" @change='selectFaclity' clearable @clear='cleareqpName' filterable
+            collapse-tags size="small" style="width:150px;" placeholder="">
+            <el-option v-for="item in facilityType" :key="item.baseCode" :label="item.baseName" :value="item.baseCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label='设备名称' prop="eqpNo">
-          <el-select v-model="searchForm.eqpNo" clearable filterable collapse-tags size="small" style="width:200px;" placeholder="">
-            <el-option
-            v-for="item in eqpType"
-            :key="item.eqpNo"
-            :label="item.eqpName + ` (${item.memo})`"
-            :value="item.eqpNo">
+          <el-select v-model="searchForm.eqpNo" clearable filterable collapse-tags size="small" style="width:200px;"
+            placeholder="">
+            <el-option v-for="item in eqpType" :key="item.eqpNo" :label="item.eqpName + ` (${item.memo})`"
+              :value="item.eqpNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="采集日期">
-          <el-date-picker
+          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="datetime"
+            placeholder="开始日期" size="mini" style="width: 180px" :default-time="'00:00:00'">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="datetime"
+            placeholder="结束日期" size="mini" style="width: 180px" :default-time="'23:59:59'">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="searchForm.times"
            type="datetimerange"
            range-separator="至"
@@ -35,7 +38,7 @@
            format=""
            value-format="yyyy-MM-dd HH:mm:ss"
            :default-time="['00:00:00', '23:59:59']">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -52,35 +55,29 @@
       </div>
     </div>
     <div>
-       <!-- class="common-table-div" -->
-       <el-table v-loading="tableLoading2" ref="dataTable2" border :height="theight" highlight-current-row  :data="tableData2" :icore-filter-flag="icoreFilterFlag"
-       :header-cell-style="tableHeaderCellStyle"  @row-click="searchFollow" :cell-class-name="tableRowClassName"  :summary-method="getSummaries2" show-summary>
+      <!-- class="common-table-div" -->
+      <el-table v-loading="tableLoading2" ref="dataTable2" border :height="theight" highlight-current-row
+        :data="tableData2" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+        @row-click="searchFollow" :cell-class-name="tableRowClassName" :summary-method="getSummaries2" show-summary>
         <el-table-column type="index" label="NO" align="center"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="stateFlag" label="状态" min-width="80"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="CREATE_TIME" label="采集日期" min-width="140"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="EQP_NAME" label="采集设备" min-width="100"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="POINT_NAME" label="采集位置" min-width="100"></el-table-column>
-        <el-table-column v-for="(item,index) in columList"
-                                     :prop="item"
-                                     :key="index"
-                                     :label="item"
-                                     width="140">
-         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="memo" label="备注"   min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="stateFlag" label="状态"
+          min-width="80"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="CREATE_TIME" label="采集日期"
+          min-width="140"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="EQP_NAME" label="采集设备"
+          min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="POINT_NAME" label="采集位置"
+          min-width="100"></el-table-column>
+        <el-table-column v-for="(item, index) in columList" :prop="item" :key="index" :label="item" width="140">
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="memo" label="备注"
+          min-width="100"></el-table-column>
       </el-table>
       <div class="common-foot-style">
-      <el-pagination
-        @size-change="handleSizeChangeMain"
-        @current-change="handleCurrentChangeMain"
-        :current-page="pageIndex"
-        :page-sizes="[10, 20, 30, 40, 100 , 200]"
-        :page-size="pageSize"
-        size="mini"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total_main"
-        background
-      ></el-pagination>
-    </div>
+        <el-pagination @size-change="handleSizeChangeMain" @current-change="handleCurrentChangeMain"
+          :current-page="pageIndex" :page-sizes="[10, 20, 30, 40, 100, 200]" :page-size="pageSize" size="mini"
+          layout="total, sizes, prev, pager, next, jumper" :total="total_main" background></el-pagination>
+      </div>
     </div>
     <!-- <div class="common-title-div">
       <div class="common-title-name">
@@ -117,42 +114,42 @@
 </template>
 <script>
 export default {
-  data () {
+  data() {
     return {
       searchForm: {
-        eqpTypeCode:'',
-        eqpNo:'',
-        times:''
+        eqpTypeCode: '',
+        eqpNo: '',
+        times: ''
       },
-      facilityType:[],
-      eqpType:[],
+      facilityType: [],
+      eqpType: [],
       theight: 0,
       theight2: 0,
       theight3: 0,
-      tableLoading1:false,
-      tableLoading2:false,
-      tableLoading3:false,
-      tableData1:[],
-      tableData2:[],
-      tableData3:[],
+      tableLoading1: false,
+      tableLoading2: false,
+      tableLoading3: false,
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
       pageIndex: 1,
-      pageSize:100,
-      total_main:0,
+      pageSize: 100,
+      total_main: 0,
       icoreFilterFlag: true,
-       rules:{
-        eqpTypeCode :[{required: true, message: '请选择设备类型', trigger: 'change'}],
-        eqpNo :[{required: true, message: '请选择设备名称', trigger: 'change'}]
+      rules: {
+        eqpTypeCode: [{ required: true, message: '请选择设备类型', trigger: 'change' }],
+        eqpNo: [{ required: true, message: '请选择设备名称', trigger: 'change' }]
       },
-      columList:[]
+      columList: []
     }
   },
   created() {
     // window.innerHeight / 2 - 110 < 249 ? 249 :
-    this.theight =  window.innerHeight -170 ;
-    this.searchForm.times = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date())+ ' 23:59:59']
+    this.theight = window.innerHeight - 170;
+    this.searchForm.times = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date()) + ' 23:59:59']
   },
-  mounted () {
-    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode",{validFlag:1,baseCode:4808}, {individualType: 'json'}).then(res => {
+  mounted() {
+    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode", { validFlag: 1, baseCode: 4808 }, { individualType: 'json' }).then(res => {
       this.facilityType = res.data
     })
     this.searchData()
@@ -199,83 +196,83 @@ export default {
       });
       return sums;
     },
-    cleareqpName(val){
+    cleareqpName(val) {
       this.searchForm.eqpNo = ''
     },
-    selectFaclity(val){
-        this.eqpType = []
-        this.searchForm.eqpNo = ''
-        if (!val) {
-          return 
+    selectFaclity(val) {
+      this.eqpType = []
+      this.searchForm.eqpNo = ''
+      if (!val) {
+        return
       }
-      this.axios.post('pass/baseManagement/v1/limslrceqpinfos/queryeqpName',{eqpTypeCode:val},{individualType: 'json'}).then(res => {
+      this.axios.post('pass/baseManagement/v1/limslrceqpinfos/queryeqpName', { eqpTypeCode: val }, { individualType: 'json' }).then(res => {
         this.eqpType = res.data;
       })
     },
-    resetData(){
+    resetData() {
       this.searchForm.eqpTypeCode = ''
       this.searchForm.eqpNo = ''
-      this.searchForm.times = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date())+ ' 23:59:59']
+      this.searchForm.times = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date()) + ' 23:59:59']
       this.searchData()
     },
-    searchData (){
+    searchData() {
       this.pageIndex = 1
       this.pageSize = 100
       this.getDataList()
     },
-    getDataList(){
+    getDataList() {
       let startTime = ''
       let endTime = ''
-       if (!this.searchForm.times) {
+      if (!this.searchForm.times) {
         startTime = ''
         endTime = ''
-      }else{
+      } else {
         startTime = this.searchForm.times[0]
         endTime = this.searchForm.times[1]
       }
       let obj = {
-        object:{
+        object: {
           eqpTypeCode: this.searchForm.eqpTypeCode,
-          eqpNo:this.searchForm.eqpNo,
+          eqpNo: this.searchForm.eqpNo,
         },
         startTime: startTime,
-        endTime:  endTime,
+        endTime: endTime,
         pageIndex: this.pageIndex,
         pageSize: this.pageSize
       }
-      if(obj.object.eqpNo && obj.startTime && obj.endTime){
-          this.tableLoading2 = true;
-          this.axios.post('pass/testManagement/v1/limsdatacollects/collectionRecord',obj, {individualType: 'json'}).then(res =>{
-            console.log(res);
-            if (res.code == 0|| res.code == 200) {
-            this.columList=res.data.columnList
-            this.tableData2=res.data.data.list
-              this.tableData2.forEach(item =>{
-                item.stateFlag=item.STATE_FLAG ==1 ? '已读' : item.STATE_FLAG==0 ? '未读' : ''
-              })      
-            }
-            this.total_main= res.data.data.total
-            this.tableLoading2 = false;
-          }).catch(err =>{
-            this.tableLoading2 = false;
-            this.$message.error(err.message)
-          })
-      }else{
-          //console.log("请选择时间段")
-          this.$message.warning('请选择设备名称和时间段')
+      if (obj.object.eqpNo && obj.startTime && obj.endTime) {
+        this.tableLoading2 = true;
+        this.axios.post('pass/testManagement/v1/limsdatacollects/collectionRecord', obj, { individualType: 'json' }).then(res => {
+          console.log(res);
+          if (res.code == 0 || res.code == 200) {
+            this.columList = res.data.columnList
+            this.tableData2 = res.data.data.list
+            this.tableData2.forEach(item => {
+              item.stateFlag = item.STATE_FLAG == 1 ? '已读' : item.STATE_FLAG == 0 ? '未读' : ''
+            })
+          }
+          this.total_main = res.data.data.total
+          this.tableLoading2 = false;
+        }).catch(err => {
+          this.tableLoading2 = false;
+          this.$message.error(err.message)
+        })
+      } else {
+        //console.log("请选择时间段")
+        this.$message.warning('请选择设备名称和时间段')
       }
     },
     //点击主表信息，查询子表
-    searchFollow(row){
+    searchFollow(row) {
       this.tableLoading3 = true;
-      this.axios.post('pass/testManagement/v1/limsdataparseds/querylimsDataPase',{psId:row.psId},{individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limsdataparseds/querylimsDataPase', { psId: row.psId }, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData3 = res.data
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading3 = false;
-      }).catch(err =>{
+      }).catch(err => {
         this.tableLoading3 = false;
         this.$message.error(err.message)
       })
@@ -289,18 +286,17 @@ export default {
       this.pageIndex = pageIndex;
       this.getDataList();
     },
-    tableHeaderCellStyle () {
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     },
-    tableRowClassName ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 1) {
-      if (row.stateFlag == '1') {
-        return 'error-green';
-      }
+        if (row.stateFlag == '1') {
+          return 'error-green';
+        }
       }
     },
   }
 }
 </script>
-<style  scoped>
-</style>
+<style scoped></style>

src/views/testAnalysis/components/oldCollectRecord.vue

@@ -2,55 +2,32 @@
 <template>
   <div class="examination">
     <div class="common-head-search">
-      <el-form
-        :inline="true"
-        @submit.native.prevent
-        ref="searchForm"
-        :model="searchForm"
-        class="demo-form-inline sui-search-form"
-      >
+      <el-form :inline="true" @submit.native.prevent ref="searchForm" :model="searchForm"
+        class="demo-form-inline sui-search-form">
         <el-form-item label="设备类型">
-          <el-select
-            v-model="searchForm.eqpTypeCode"
-            @change="selectFaclity"
-            clearable
-            @clear="cleareqpName"
-            filterable
-            collapse-tags
-            size="small"
-            style="width: 150px"
-            placeholder=""
-          >
-            <el-option
-              v-for="item in facilityType"
-              :key="item.baseCode"
-              :label="item.baseName"
-              :value="item.baseCode"
-            >
+          <el-select v-model="searchForm.eqpTypeCode" @change="selectFaclity" clearable @clear="cleareqpName" filterable
+            collapse-tags size="small" style="width: 150px" placeholder="">
+            <el-option v-for="item in facilityType" :key="item.baseCode" :label="item.baseName" :value="item.baseCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="设备名称">
-          <el-select
-            v-model="searchForm.eqpNo"
-            clearable
-            filterable
-            collapse-tags
-            size="small"
-            style="width: 200px"
-            placeholder=""
-          >
-            <el-option
-              v-for="item in eqpType"
-              :key="item.eqpNo"
-              :label="item.eqpName + ` (${item.eqpUseNo})`"
-              :value="item.eqpNo"
-            >
+          <el-select v-model="searchForm.eqpNo" clearable filterable collapse-tags size="small" style="width: 200px"
+            placeholder="">
+            <el-option v-for="item in eqpType" :key="item.eqpNo" :label="item.eqpName + ` (${item.eqpUseNo})`"
+              :value="item.eqpNo">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="采集日期">
-          <el-date-picker
+          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="datetime"
+            placeholder="开始日期" size="mini" style="width: 180px" :default-time="'00:00:00'">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="datetime"
+            placeholder="结束日期" size="mini" style="width: 180px" :default-time="'23:59:59'">
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="searchForm.times"
             type="datetimerange"
             range-separator="至"
@@ -61,267 +38,108 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            type="goon"
-            size="mini"
-            @click="searchData"
-            >查询</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            type="info"
-            plain
-            size="mini"
-            @click="resetData"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="resetData">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="common-title-div">
       <div class="common-title-name">
-        <img
-          style="width: 25px; height: 25px"
-          src="../../../assets/img/imgScreen/logo.png"
-        />
+        <img style="width: 25px; height: 25px" src="../../../assets/img/imgScreen/logo.png" />
         样品信息
       </div>
       <div>
-        <el-button
-          icon="el-icon-back"
-          type="danger"
-          :loading="backDataLoading"
-          v-privilege="activeMenu + 'backData'"
-          size="mini"
-          @click="backData"
-          >回退</el-button
-        >
-        <el-button
-          icon="el-icon-check"
-          type="goon"
-          :loading="backDataLoading"
-          size="mini"
-          @click="save"
-          >保存</el-button
-        >
-        <el-button icon="el-icon-remove-outline" type="danger" :loading='deleteLoading' size="mini" v-privilege="activeMenu + 'backData'" @click="disable">停用</el-button>
-        <el-button icon="el-icon-check" :loading='deleteLoading' @click="enable" type="goon" v-privilege="activeMenu + 'backData'" size="mini">启用</el-button>
-        <el-button icon="el-icon-check" :loading='deleteLoading' @click="merge" type="goon" v-privilege="activeMenu + 'backData'" size="mini">合并</el-button>
-        <el-button icon="el-icon-check" :loading='deleteLoading' @click="noMerge" type="danger" v-privilege="activeMenu + 'backData'" size="mini">撤回合并</el-button>
+        <el-button icon="el-icon-back" type="danger" :loading="backDataLoading" v-privilege="activeMenu + 'backData'"
+          size="mini" @click="backData">回退</el-button>
+        <el-button icon="el-icon-check" type="goon" :loading="backDataLoading" size="mini" @click="save">保存</el-button>
+        <el-button icon="el-icon-remove-outline" type="danger" :loading='deleteLoading' size="mini"
+          v-privilege="activeMenu + 'backData'" @click="disable">停用</el-button>
+        <el-button icon="el-icon-check" :loading='deleteLoading' @click="enable" type="goon"
+          v-privilege="activeMenu + 'backData'" size="mini">启用</el-button>
+        <el-button icon="el-icon-check" :loading='deleteLoading' @click="merge" type="goon"
+          v-privilege="activeMenu + 'backData'" size="mini">合并</el-button>
+        <el-button icon="el-icon-check" :loading='deleteLoading' @click="noMerge" type="danger"
+          v-privilege="activeMenu + 'backData'" size="mini">撤回合并</el-button>
         <span>&nbsp;&nbsp;&nbsp;备注为一串数字的数据为子数据</span>
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom: 0; margin-top: 0">
-      <el-table
-        v-loading="tableLoading2"
-        ref="dataTable2"
-        border
-        :height="theight"
-        highlight-current-row
-        @selection-change="handleSelectionChange"
-        :data="tableData2"
-        :icore-filter-flag="icoreFilterFlag"
-        :header-cell-style="tableHeaderCellStyle"
-        @current-change="clickChange"
-        @row-click="searchFollow"
-        :cell-class-name="tableRowClassName"
-        :summary-method="getSummaries2"
-        show-summary
-      >
-        <el-table-column
-          type="index"
-          label="NO"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="stateFlagName"
-          label="状态"
-          min-width="80"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="createTime"
-          label="采集日期"
-          min-width="140"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="collSampleNo"
-          label="采集样号"
-          min-width="100"
-        >
-         <!-- && scope.row.validFlag == 1 -->
+      <el-table v-loading="tableLoading2" ref="dataTable2" border :height="theight" highlight-current-row
+        @selection-change="handleSelectionChange" :data="tableData2" :icore-filter-flag="icoreFilterFlag"
+        :header-cell-style="tableHeaderCellStyle" @current-change="clickChange" @row-click="searchFollow"
+        :cell-class-name="tableRowClassName" :summary-method="getSummaries2" show-summary>
+        <el-table-column type="index" label="NO" align="center"></el-table-column>
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="stateFlagName" label="状态"
+          min-width="80"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="createTime" label="采集日期"
+          min-width="140"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="collSampleNo" label="采集样号"
+          min-width="100">
+          <!-- && scope.row.validFlag == 1 -->
           <template slot-scope="scope">
-            <el-input
-              class="item-input"
-              type="text"
+            <el-input class="item-input" type="text"
               v-if="scope.$index === tabClickIndex && scope.row.stateFlag != 1 && scope.row.validFlag != 0"
-              @blur="saveCell"
-              v-model="scope.row.collSampleNo"
-              @keyup.enter.native="saveCell"
-              size="small"
-              style="width: 100%; text-align: center"
-            >
+              @blur="saveCell" v-model="scope.row.collSampleNo" @keyup.enter.native="saveCell" size="small"
+              style="width: 100%; text-align: center">
             </el-input>
             <span v-else>{{ scope.row.collSampleNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="eqpName"
-          label="采集设备"
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="pointName"
-          label="采集位置"
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="archiveTime"
-          label="已读时间"
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="memo"
-          label="备注"
-          min-width="100"
-        ></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="eqpName" label="采集设备"
+          min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="pointName" label="采集位置"
+          min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="archiveTime" label="已读时间"
+          min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="memo" label="备注"
+          min-width="100"></el-table-column>
       </el-table>
       <div class="common-foot-style">
-        <el-pagination
-          @size-change="handleSizeChangeMain"
-          @current-change="handleCurrentChangeMain"
-          :current-page="pageIndex"
-          :page-sizes="[10, 20, 30, 40, 100, 200]"
-          :page-size="pageSize"
-          size="mini"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total_main"
-          background
-        ></el-pagination>
+        <el-pagination @size-change="handleSizeChangeMain" @current-change="handleCurrentChangeMain"
+          :current-page="pageIndex" :page-sizes="[10, 20, 30, 40, 100, 200]" :page-size="pageSize" size="mini"
+          layout="total, sizes, prev, pager, next, jumper" :total="total_main" background></el-pagination>
       </div>
     </div>
     <div class="common-title-div">
       <div class="common-title-name">
-        <img
-          style="width: 25px; height: 25px"
-          src="../../../assets/img/imgScreen/logo.png"
-        />
+        <img style="width: 25px; height: 25px" src="../../../assets/img/imgScreen/logo.png" />
         项目信息
       </div>
       <div>
-        <el-button icon="el-icon-remove-outline" type="danger" :loading='deleteLoading2' size="mini" v-privilege="activeMenu + 'backData'" @click="disableZi">停用</el-button>
-        <el-button icon="el-icon-check" :loading='deleteLoading2' @click="enableZi" type="goon" v-privilege="activeMenu + 'backData'" size="mini">启用</el-button>
-        <el-button
-          icon="el-icon-check"
-          type="goon"
-          :loading="deleteLoading2"
-          size="mini"
-          @click="saveZi"
-          >保存</el-button
-        >
+        <el-button icon="el-icon-remove-outline" type="danger" :loading='deleteLoading2' size="mini"
+          v-privilege="activeMenu + 'backData'" @click="disableZi">停用</el-button>
+        <el-button icon="el-icon-check" :loading='deleteLoading2' @click="enableZi" type="goon"
+          v-privilege="activeMenu + 'backData'" size="mini">启用</el-button>
+        <el-button icon="el-icon-check" type="goon" :loading="deleteLoading2" size="mini" @click="saveZi">保存</el-button>
       </div>
     </div>
     <div class="common-table-div" style="margin-bottom: 0; margin-top: 0">
-      <el-table
-        v-loading="tableLoading3"
-        border
-        :height="theight"
-        highlight-current-row
-        @selection-change="handleSelectionChange2"
-        :data="tableData3"
-        @current-change="clickChange2"
-        :icore-filter-flag="icoreFilterFlag"
-        :header-cell-style="tableHeaderCellStyle"
-        :summary-method="getSummaries2"
-        :cell-class-name="tableRowClassName2"
-        show-summary
-      >
-        <el-table-column
-          type="index"
-          label="NO"
-          fixed="left"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="validFlagName"
-          label="状态"
-          min-width="20"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="collIdD"
-          label="采集项目编号"
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="collItemName"
-          label="采集项目名称"
-          min-width="100"
-        >
-        <template slot-scope="scope">
-            <el-input
-              class="item-input"
-              :disabled="scope.row.validFlag != 1"
-              type="text"
-              v-if="scope.$index === tabClickIndex2 && biaoshi"
-              v-model="scope.row.collItemName"
-              size="small"
-              style="width: 100%; text-align: center"
-            >
+      <el-table v-loading="tableLoading3" border :height="theight" highlight-current-row
+        @selection-change="handleSelectionChange2" :data="tableData3" @current-change="clickChange2"
+        :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle" :summary-method="getSummaries2"
+        :cell-class-name="tableRowClassName2" show-summary>
+        <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="validFlagName" label="状态"
+          min-width="20"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="collIdD" label="采集项目编号"
+          min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="collItemName" label="采集项目名称"
+          min-width="100">
+          <template slot-scope="scope">
+            <el-input class="item-input" :disabled="scope.row.validFlag != 1" type="text"
+              v-if="scope.$index === tabClickIndex2 && biaoshi" v-model="scope.row.collItemName" size="small"
+              style="width: 100%; text-align: center">
             </el-input>
             <span v-else>{{ scope.row.collItemName }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          sortable
-          align="center"
-          prop="testValue"
-          label="采集值"
-          min-width="100"
-        ></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="testValue" label="采集值"
+          min-width="100"></el-table-column>
       </el-table>
     </div>
     <!-- <div class="common-foot-style">
@@ -560,16 +378,16 @@ export default {
           let arr1 = this.multipleSelection;
           let arr2 = this.multipleSelection;
           let falg = false
-          arr1.forEach((item1,index1) => {
-            arr2.forEach((item,index) => {
-              if(index1 != index){
-                if(item1.collSampleNo != item.collSampleNo){
-                    falg = true
+          arr1.forEach((item1, index1) => {
+            arr2.forEach((item, index) => {
+              if (index1 != index) {
+                if (item1.collSampleNo != item.collSampleNo) {
+                  falg = true
                 }
               }
             })
           })
-          if(falg){
+          if (falg) {
             throw new Error("请选择相同的采集样号！");
           }
         });
@@ -599,7 +417,7 @@ export default {
         });
     },
     noMerge() { //撤回合并
-      if (this.multipleSelection.length > 1 ||  this.multipleSelection.length < 1) {
+      if (this.multipleSelection.length > 1 || this.multipleSelection.length < 1) {
         this.$message.warning("请先勾选要撤回合并一条数据");
         return;
       }
@@ -848,15 +666,15 @@ export default {
             this.tableData2 = res.data.list;
             this.total_main = res.data.total;
             this.tableData2.forEach((item) => {
-              if (item.validFlag == '0'){
+              if (item.validFlag == '0') {
                 item.stateFlagName = '已停用'
-              }else{
+              } else {
                 item.stateFlagName =
-                item.stateFlag == 1
-                  ? "已读"
-                  : item.stateFlag == 0
-                  ? "未读"
-                  : "";
+                  item.stateFlag == 1
+                    ? "已读"
+                    : item.stateFlag == 0
+                      ? "未读"
+                      : "";
               }
             });
             if (this.tableData2.length > 0) {
@@ -875,7 +693,7 @@ export default {
         });
     },
     // 表格文本框失焦回调
-    saveCell() {},
+    saveCell() { },
     clickChange2(row) {
       let uindex = this.tableData3.findIndex(
         (item) => item.collIdD === row.collIdD
@@ -890,12 +708,12 @@ export default {
       );
       console.log(uindex);
       this.tabClickIndex = uindex;
-      if(row.validFlag == '0'){
+      if (row.validFlag == '0') {
         this.biaoshi = false
-      }else{
-        if(row.stateFlag == '1'){
+      } else {
+        if (row.stateFlag == '1') {
           this.biaoshi = false
-        }else{
+        } else {
           this.biaoshi = true
         }
       }
@@ -915,7 +733,7 @@ export default {
             this.tableData3.forEach((item) => {
               if (item.validFlag == '0') {
                 item.validFlagName = '已停用'
-              }else if (item.validFlag == '1'){
+              } else if (item.validFlag == '1') {
                 item.validFlagName = '有效'
               }
             })
@@ -943,7 +761,7 @@ export default {
             this.tableData3.forEach((item) => {
               if (item.validFlag == '0') {
                 item.validFlagName = '已停用'
-              }else if (item.validFlag == '1'){
+              } else if (item.validFlag == '1') {
                 item.validFlagName = '有效'
               }
             })
@@ -974,14 +792,14 @@ export default {
         if (row.stateFlag == "1") {
           return "error-green";
         }
-        if (row.validFlag == '0'){
+        if (row.validFlag == '0') {
           return "error-row"
         }
       }
     },
     tableRowClassName2({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 2) {
-        if (row.validFlag == '0'){
+        if (row.validFlag == '0') {
           return "error-row"
         }
       }

src/views/testAnalysis/components/oldDataInfo.vue

@@ -4,58 +4,45 @@
     <div class="common-head-search">
       <el-form :inline='true'>
         <el-form-item label="检验车间">
-          <el-select
-            v-model="searchForm.deptNo"
-            filterable
-            clearable
-            style="width:150px"
-            collapse-tags
-            @clear='clearSelect'
-            @change="selectClass"
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionNameType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="searchForm.deptNo" filterable clearable style="width:150px" collapse-tags
+            @clear='clearSelect' @change="selectClass" size="small">
+            <el-option v-for="item in sectionNameType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="检验班组">
-          <el-select
-            v-model="searchForm.sectionNo"
-            filterable
-            clearable
-            style="width:150px"
-            collapse-tags
-            size="small"
-          >
-            <el-option
-              v-for="item in sectionClassType"
-              :key="item.orgCode"
-              :label="item.orgName"
-              :value="item.orgCode"
-            >
+          <el-select v-model="searchForm.sectionNo" filterable clearable style="width:150px" collapse-tags size="small">
+            <el-option v-for="item in sectionClassType" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label='样品类型'>
-          <el-select v-model="searchForm.sampleTypeCode" clearable filterable collapse-tags size="small" style="width:150px;" placeholder="请选择">
+          <el-select v-model="searchForm.sampleTypeCode" clearable filterable collapse-tags size="small"
+            style="width:150px;" placeholder="请选择">
             <el-option v-for="item in sampleTypeNameType" :key="item.baseCode" :label="item.baseName"
               :value="item.baseCode">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="searchForm.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称" style="width:150px"></el-input>
+          <el-input v-model="searchForm.matName" @keyup.enter.native="searchData()" size="small" placeholder="请输入物料名称"
+            style="width:150px"></el-input>
         </el-form-item>
         <el-form-item label="样号">
-          <el-input v-model="searchForm.sampleNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入样号" style="width:150px"></el-input>
+          <el-input v-model="searchForm.sampleNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入样号"
+            style="width:150px"></el-input>
         </el-form-item>
         <el-form-item label="测试时间">
-          <el-date-picker
+          <el-date-picker v-model="searchForm.entrTime[0]" value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="开始日期" size="mini" style="width: 180px"
+            :default-time="'00:00:00'">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="searchForm.entrTime[1]" value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="结束日期" size="mini" style="width: 180px"
+            :default-time="'23:59:59'">
+          </el-date-picker>
+          <!-- <el-date-picker
            v-model="searchForm.entrTime"
            type="daterange"
            range-separator="至"
@@ -66,7 +53,7 @@
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            :default-time="['00:00:00','23:59:59']">
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
@@ -76,28 +63,39 @@
     </div>
     <el-row>
       <el-col :span='12'>
-        <div class="common-title-div" >
+        <div class="common-title-div">
           <div class="common-title-name">
             <img style="width: 25px; height: 25px" src='../../../assets/img/imgScreen/logo.png' />
             任务信息
           </div>
           <div>
-            <el-button icon="el-icon-back" type="danger" :loading='backDataLoading' v-privilege="activeMenu + 'backData'" size="mini" @click="backData">回退</el-button>
+            <el-button icon="el-icon-back" type="danger" :loading='backDataLoading'
+              v-privilege="activeMenu + 'backData'" size="mini" @click="backData">回退</el-button>
           </div>
         </div>
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-          <el-table v-loading="tableLoading" ref="dataTable" border :height="mainHeight" highlight-current-row  @selection-change="handleSelectionChange" :data="tableData" :icore-filter-flag="icoreFilterFlag"
-           :header-cell-style="tableHeaderCellStyle"  @row-click="searchFollow" :cell-class-name="tableRowClassName"  :summary-method="getSummaries2" show-summary>
+          <el-table v-loading="tableLoading" ref="dataTable" border :height="mainHeight" highlight-current-row
+            @selection-change="handleSelectionChange" :data="tableData" :icore-filter-flag="icoreFilterFlag"
+            :header-cell-style="tableHeaderCellStyle" @row-click="searchFollow" :cell-class-name="tableRowClassName"
+            :summary-method="getSummaries2" show-summary>
             <el-table-column type="index" label="NO" align="center"></el-table-column>
             <el-table-column type="selection" width="50" align="center"></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="60" align="center" prop="stateFlagName" label="状态"></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="150" align="center" prop="matName" label="样品名称"></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="130" align='center' prop="sampleNo" label="样品编号" ></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="150" align='center' prop="testItemName" label="测试项目" ></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="90" align='center' prop="createMan" label="测试人" ></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="100" align='center' prop="eqpName" label="测试设备" ></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="100" align="center" prop="createTime" label="测试时间"></el-table-column>
-            <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="stdName" label="环境配置" ></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="60" align="center" prop="stateFlagName"
+              label="状态"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="150" align="center" prop="matName"
+              label="样品名称"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="130" align='center' prop="sampleNo"
+              label="样品编号"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="150" align='center' prop="testItemName"
+              label="测试项目"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="90" align='center' prop="createMan"
+              label="测试人"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="100" align='center' prop="eqpName"
+              label="测试设备"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="100" align="center" prop="createTime"
+              label="测试时间"></el-table-column>
+            <el-table-column show-overflow-tooltip sortable min-width="80" align="center" prop="stdName"
+              label="环境配置"></el-table-column>
             <!-- <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="stateFlagName" label="状态" min-width="80"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" sortable min-width="100px" prop="id" label="编号" align="center"></el-table-column>
             <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="planCompanyName" label="委托单位"  align="center"></el-table-column>
@@ -121,17 +119,9 @@
           </el-table>
         </div>
         <div class="common-foot-style">
-          <el-pagination
-            @size-change="handleSizeChangeMain"
-            @current-change="handleCurrentChangeMain"
-            :current-page="pageIndex"
-            :page-sizes="[10, 20, 30, 40, 100 , 200]"
-            :page-size="pageSize"
-            size="mini"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total_main"
-            background
-          ></el-pagination>
+          <el-pagination @size-change="handleSizeChangeMain" @current-change="handleCurrentChangeMain"
+            :current-page="pageIndex" :page-sizes="[10, 20, 30, 40, 100, 200]" :page-size="pageSize" size="mini"
+            layout="total, sizes, prev, pager, next, jumper" :total="total_main" background></el-pagination>
         </div>
       </el-col>
       <el-col :span='12'>
@@ -144,15 +134,22 @@
               </div>
             </div>
             <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-              <el-table v-loading="tableLoading2" ref="dataTable2"  border :height="theight" highlight-current-row  :data="tableData2" :icore-filter-flag="icoreFilterFlag"
-               :header-cell-style="tableHeaderCellStyle" @row-click="searchFollow2" :summary-method="getSummaries2" show-summary>
-                <el-table-column type="index" label="NO"  align="center"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="anlyItemName" label="分析项目" min-width="100"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="anlyValue" label="报出值" min-width="100"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="reviseValue" label="修约值" min-width="100"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="dasValue" label="采集值" min-width="100"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="cptValue" label="计算值" min-width="100"></el-table-column>
-                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="isAlarm" label="超差预警显示" min-width="100"></el-table-column>
+              <el-table v-loading="tableLoading2" ref="dataTable2" border :height="theight" highlight-current-row
+                :data="tableData2" :icore-filter-flag="icoreFilterFlag" :header-cell-style="tableHeaderCellStyle"
+                @row-click="searchFollow2" :summary-method="getSummaries2" show-summary>
+                <el-table-column type="index" label="NO" align="center"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="anlyItemName" label="分析项目"
+                  min-width="100"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="anlyValue" label="报出值"
+                  min-width="100"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="reviseValue" label="修约值"
+                  min-width="100"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="dasValue" label="采集值"
+                  min-width="100"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="cptValue" label="计算值"
+                  min-width="100"></el-table-column>
+                <el-table-column :show-overflow-tooltip="true" sortable align="center" prop="isAlarm" label="超差预警显示"
+                  min-width="100"></el-table-column>
 
                 <!-- <template v-for="col in cols">
 	              <el-table-column
@@ -217,65 +214,65 @@
   </div>
 </template>
 <script>
-import {getCookie,formatDate} from '@/utils/util.js';
+import { getCookie, formatDate } from '@/utils/util.js';
 import {
   cookieUserId,
   cookieUserName
 } from '@/config/config.js';
 export default {
-  data () {
+  data() {
     return {
       searchForm: {
-        deptNo:'',
-        sectionNo:'',
-        sampleTypeCode:'',
-        matName:'',
-        sampleNo:'',
-        entrTime:''
+        deptNo: '',
+        sectionNo: '',
+        sampleTypeCode: '',
+        matName: '',
+        sampleNo: '',
+        entrTime: ''
       },
-      sectionClassType:[],
-      facilityType:[],
-      companyNameType:[],
-      sectionNameType:[],
-      eqpType:[],
+      sectionClassType: [],
+      facilityType: [],
+      companyNameType: [],
+      sectionNameType: [],
+      eqpType: [],
       theight: 0,
-      mainHeight:0,
+      mainHeight: 0,
       theight2: 0,
       theight3: 0,
-      tableLoading1:false,
-      tableLoading:false,
-      tableLoading2:false,
-      tableLoading3:false,
-      backDataLoading:false,
-      multipleSelection:[],
-      sampleTypeNameType:[],
-      cols:[],
-      tableData1:[],
-      tableData:[],
-      tableData2:[],
-      tableData3:[],
+      tableLoading1: false,
+      tableLoading: false,
+      tableLoading2: false,
+      tableLoading3: false,
+      backDataLoading: false,
+      multipleSelection: [],
+      sampleTypeNameType: [],
+      cols: [],
+      tableData1: [],
+      tableData: [],
+      tableData2: [],
+      tableData3: [],
       pageIndex: 1,
-      pageSize:100,
-      total_main:0,
+      pageSize: 100,
+      total_main: 0,
       icoreFilterFlag: true,
-      activeMenu:''
+      activeMenu: ''
     }
   },
   created() {
-    this.theight = window.innerHeight - 220 < 249 ? 249 : window.innerHeight  - 220;
-    this.mainHeight = this.theight <= 249 ? this.theight + 100: window.innerHeight - 180
-    this.searchForm.entrTime = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date())+ ' 23:59:59']
+    this.theight = window.innerHeight - 220 < 249 ? 249 : window.innerHeight - 220;
+    this.mainHeight = this.theight <= 249 ? this.theight + 100 : window.innerHeight - 180
+    this.searchForm.entrTime = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date()) + ' 23:59:59']
     this.activeMenu = window.top.localStorage.getItem('activeMenu')
   },
-  mounted () {
+  mounted() {
     // this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList',{sectionNo: this.sectionNo}, {individualType: 'json'}).then(res =>{
     //   this.jobType = res.data
     // })
-    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll",{},{ individualType: "json" }).then((response) => {
+    this.axios.post("pass/baseManagement/v1/sysorgs/querySysOrgCompanyAll", {}, { individualType: "json" }).then((response) => {
       this.companyNameType = response.data;
       this.selectDepartment('F31300000')
     });
-    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode",{validFlag:1,baseCode:4801}, {individualType: 'json'}).then(res => {
+    this.axios.post("pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode", { validFlag: 1, baseCode: 4801 }, { individualType: 'json' }).then(res => {
       this.sampleTypeNameType = res.data
     })
     this.getCompany();
@@ -333,108 +330,108 @@ export default {
       });
       return sums;
     },
-    selectDepartment(val){
+    selectDepartment(val) {
       this.sectionNameType = []
       // this.pointNameType = []
-      this.companyNameType.find(item =>{
-        if(val === item.orgCode){
+      this.companyNameType.find(item => {
+        if (val === item.orgCode) {
           this.sectionNameType = item.sysOrgList
         }
       })
     },
-    clearSelect(){
+    clearSelect() {
       this.searchForm.sectionNo = ''
     },
     //回退
-    backData(){
+    backData() {
       if (this.multipleSelection.length < 1) {
         this.$message.warning('请先勾选要回退的数据')
       }
       let flag = this.multipleSelection[0].stateFlag
-      for(let item of this.multipleSelection){
+      for (let item of this.multipleSelection) {
         if (item.stateFlag != flag) {
           this.$message.warning('请选择同一状态的数据')
           return
         }
       }
       this.backDataLoading = true
-      this.axios.post('pass/testManagement/v1/limsdatacollects/updatestate',this.multipleSelection,{individualType: 'json'}).then(res => {
+      this.axios.post('pass/testManagement/v1/limsdatacollects/updatestate', this.multipleSelection, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.$message.success(res.message)
           this.searchData()
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.backDataLoading = false
-      }).catch(err =>{
+      }).catch(err => {
         this.backDataLoading = false
         this.$message.error(err.message)
       })
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    cleareqpName(val){
+    cleareqpName(val) {
       this.searchForm.eqpNo = ''
     },
-    selectFaclity(val){
-        this.eqpType = []
-        this.searchForm.eqpNo = ''
-        if (!val) {
-          return
+    selectFaclity(val) {
+      this.eqpType = []
+      this.searchForm.eqpNo = ''
+      if (!val) {
+        return
       }
-      this.axios.post('pass/baseManagement/v1/limslrceqpinfos/queryeqpName',{eqpTypeCode:val},{individualType: 'json'}).then(res => {
+      this.axios.post('pass/baseManagement/v1/limslrceqpinfos/queryeqpName', { eqpTypeCode: val }, { individualType: 'json' }).then(res => {
         this.eqpType = res.data;
       })
     },
-    resetData(){
+    resetData() {
       this.searchForm.deptNo = ''
       this.searchForm.sampleNo = ''
       this.searchForm.sectionNo = ''
       this.searchForm.sampleTypeCode = ''
       this.searchForm.jobs = ''
       this.searchForm.matName = ''
-      this.searchForm.entrTime = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date())+ ' 23:59:59']
+      this.searchForm.entrTime = [this.getYNM(new Date()) + ' 00:00:00', this.getYNM(new Date()) + ' 23:59:59']
       this.searchData()
     },
-    searchData (){
+    searchData() {
       this.pageIndex = 1
       this.pageSize = 100
       this.DataMain()
     },
-    DataMain () {
+    DataMain() {
       let startTime = ''
       let endTime = ''
-       if (!this.searchForm.entrTime) {
+      if (!this.searchForm.entrTime) {
         startTime = ''
         endTime = ''
-      }else{
+      } else {
         startTime = this.searchForm.entrTime[0]
         endTime = this.searchForm.entrTime[1]
       }
       let obj = {
-        'object':{
+        'object': {
           // 'deptNo':this.searchForm.deptNo,
           // 'sectionNo':this.searchForm.sectionNo,
-          'testPostCode':this.searchForm.jobs,
-          'sampleTypeCode':this.searchForm.sampleTypeCode,
-          'matName':this.searchForm.matName,
+          'testPostCode': this.searchForm.jobs,
+          'sampleTypeCode': this.searchForm.sampleTypeCode,
+          'matName': this.searchForm.matName,
           'validFlag': '1'
         },
         // 'list':[0], // 已接任务、未处理状态
-        'list2':[484003], // 测试分析模块
+        'list2': [484003], // 测试分析模块
         // mode:this.searchForm.sampleNo,
         'startTime': startTime,
-        'endTime':  endTime,
+        'endTime': endTime,
         'pageIndex': this.pageIndex,
         'pageSize': this.pageSize
       }
       this.tableLoading = true;
-      this.axios.post('pass/testManagement/v1/limssampletests/queryLimsSampleTestPage',obj, {individualType: 'json'}).then(res =>{
-        if (res.code == 0|| res.code == 200) {
+      this.axios.post('pass/testManagement/v1/limssampletests/queryLimsSampleTestPage', obj, { individualType: 'json' }).then(res => {
+        if (res.code == 0 || res.code == 200) {
           this.tableData = res.data.list
           this.total_main = res.data.total
-          this.tableData.forEach(item =>{
+          this.tableData.forEach(item => {
             item.stateFlagName = item.stateFlag === '0' ? '编辑' : item.stateFlag === '3' ? '提交' : ''
             item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd')
           })
@@ -442,20 +439,20 @@ export default {
             // this.$refs.dataTable.setCurrentRow(this.tableData[0])
             this.searchFollow(this.tableData[0])
           }
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading = false;
-      }).catch(err =>{
+      }).catch(err => {
         this.tableLoading = false;
         this.$message.error(err.message)
       })
     },
     //点击主表信息，查询子表
-    searchFollow(row){
+    searchFollow(row) {
       this.tableLoading2 = true;
       // var obj = JSON.stringify(row);
-      this.axios.post('pass/testManagement/v1/limssampletestds/queryLimsSampleTestDList?stId='+row.stId,{individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limssampletestds/queryLimsSampleTestDList?stId=' + row.stId, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData2 = res.data
           let data = res.data
@@ -468,24 +465,24 @@ export default {
           // if(this.tableData2[0] != null){
           //   this.searchFollow2(this.tableData2[0])
           // }
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading2 = false;
-      }).catch(err =>{
+      }).catch(err => {
         this.tableLoading2 = false;
         this.$message.error(err.message)
       })
-    },searchFollow2(row){ //查询原始记录
+    }, searchFollow2(row) { //查询原始记录
       this.tableLoading2 = true;
-      this.axios.post('pass/testManagement/v1/limssampletestds/queryLimsSampleTestDByEntrId',{srId:row.srId,testItemNo:row.testItemNo},{individualType: 'json'}).then(res =>{
+      this.axios.post('pass/testManagement/v1/limssampletestds/queryLimsSampleTestDByEntrId', { srId: row.srId, testItemNo: row.testItemNo }, { individualType: 'json' }).then(res => {
         if (res.code == 0 || res.code == 200) {
           this.tableData3 = res.data
-        }else{
+        } else {
           this.$message.error(res.message)
         }
         this.tableLoading2 = false;
-      }).catch(err =>{
+      }).catch(err => {
         this.tableLoading2 = false;
         this.$message.error(err.message)
       })
@@ -523,18 +520,17 @@ export default {
       this.pageIndex = pageIndex;
       this.DataMain();
     },
-    tableHeaderCellStyle () {
+    tableHeaderCellStyle() {
       return 'color: rgb(255,255,255);border-bottom: 1px solid #DCDFE7;'
     },
-    tableRowClassName ({row, column, rowIndex, columnIndex}) {
+    tableRowClassName({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 2) {
-      if (row.stateFlag == '3') {
-        return 'error-green';
-      }
+        if (row.stateFlag == '3') {
+          return 'error-green';
+        }
       }
     },
   }
 }
 </script>
-<style  scoped>
-</style>
+<style scoped></style>