From 477c83817b53219939d2e538966a3df0532dc987 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 24 Jan 2024 17:24:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20cnas=E6=B7=BB=E5=8A=A0=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/ability/cma.vue              | 261 ++---
 client/src/views/ability/cma2.vue             | 321 +++---
 .../apps/ability/migrations/0038_cnas_sm.py   |  18 +
 server/apps/ability/models.py                 | 306 +++---
 server/apps/ability/views.py                  | 914 +++++++++---------
 5 files changed, 823 insertions(+), 997 deletions(-)
 create mode 100644 server/apps/ability/migrations/0038_cnas_sm.py

diff --git a/client/src/views/ability/cma.vue b/client/src/views/ability/cma.vue
index b173ada..57d5276 100644
--- a/client/src/views/ability/cma.vue
+++ b/client/src/views/ability/cma.vue
@@ -1,152 +1,73 @@
 <template>
   <div class="app-container">
     <el-card>
-    <el-row :gutter="6">
-      <el-col :xs="24" :md="16">
-        <el-input
-          v-model="listQuery.search"
-          placeholder="项目/标准/编号/中心"
-          style="width: 100%"
-          class="filter-item"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-col>
-      <el-col :xs="24" :md="8">
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter"
-          >搜索</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter"
-          >重置</el-button
-        >
-      </el-col>
-    </el-row>
-    <div style="margin-top: 10px">
-      <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['cma_create'])">新增</el-button> -->
-      <el-popover
-        placement="top"
-        width="160"
-        v-if="checkPermission(['ability_import'])"
-        v-model="popovervisible"
-      >
-        <p>导入能力列表压缩包.</p>
-        <div style="text-align: left; margin: 0">
-          <el-upload
-            :action="upUrl"
-            :on-success="handleUploadSuccess"
-            accept=".zip"
-            :headers="upHeaders"
-            :show-file-list="false"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              @click="popovervisible = false"
-              >上传导入</el-button
-            >
-          </el-upload>
-        </div>
+      <el-row :gutter="6">
+        <el-col :xs="24" :md="16">
+          <el-input v-model="listQuery.search" placeholder="项目/标准/编号/中心" style="width: 100%" class="filter-item"
+            @keyup.enter.native="handleFilter" />
+        </el-col>
+        <el-col :xs="24" :md="8">
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-refresh-left" @click="resetFilter">重置</el-button>
+        </el-col>
+      </el-row>
+      <div style="margin-top: 10px">
+        <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['cma_create'])">新增</el-button> -->
+        <el-popover placement="top" width="160" v-if="checkPermission(['ability_import'])" v-model="popovervisible">
+          <p>导入能力列表压缩包.</p>
+          <div style="text-align: left; margin: 0">
+            <el-upload :action="upUrl" :on-success="handleUploadSuccess" accept=".zip" :headers="upHeaders"
+              :show-file-list="false">
+              <el-button size="small" type="primary" @click="popovervisible = false">上传导入</el-button>
+            </el-upload>
+          </div>
 
-        <el-button slot="reference">导入CMA能力</el-button>
-      </el-popover>
-      <el-popover
-        placement="top"
-        width="160"
-        v-if="checkPermission(['ability_import'])"
-        v-model="popovervisible2"
-      >
-        <p>导入能力列表压缩包.</p>
-        <div style="text-align: left; margin: 0">
-          <el-upload
-            :action="upUrl"
-            :on-success="handleUploadSuccess2"
-            accept=".zip"
-            :headers="upHeaders"
-            :show-file-list="false"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              @click="popovervisible2 = false"
-              >上传导入</el-button
-            >
-          </el-upload>
-        </div>
+          <el-button slot="reference">导入CMA能力</el-button>
+        </el-popover>
+        <el-popover placement="top" width="160" v-if="checkPermission(['ability_import'])" v-model="popovervisible2">
+          <p>导入能力列表压缩包.</p>
+          <div style="text-align: left; margin: 0">
+            <el-upload :action="upUrl" :on-success="handleUploadSuccess2" accept=".zip" :headers="upHeaders"
+              :show-file-list="false">
+              <el-button size="small" type="primary" @click="popovervisible2 = false">上传导入</el-button>
+            </el-upload>
+          </div>
 
-        <el-button slot="reference">导入CNAS能力</el-button>
-      </el-popover>
-    </div>
+          <el-button slot="reference">导入CNAS能力</el-button>
+        </el-popover>
+      </div>
     </el-card>
     <el-card style="margin-top: 6px">
       <div slot="header" class="clearfix">
-            <span>资质认定CMA</span>
-          </div>
-      <el-table
-        v-loading="listLoading"
-        :data="cmaList.results"
-        style="width: 100%"
-        border
-        fit
-        stripe
-        highlight-current-row
-        max-height="300"
-        ref="filterTable"
-        @filter-change="filterChange"
-      >
+        <span>资质认定CMA</span>
+      </div>
+      <el-table v-loading="listLoading" :data="cmaList.results" style="width: 100%" border fit stripe
+        highlight-current-row max-height="300" ref="filterTable" @filter-change="filterChange">
         <el-table-column type="index" width="50" />
         <el-table-column align="center" label="大类名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.dlmc)" v-if="scope.row.dlmc"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.dlmc)" v-if="scope.row.dlmc"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="类别名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.lbmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.lbmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="项目序号">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.xmxh)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xmxh)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="项目名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.xmmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xmmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="标准名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.bzmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="标准编号">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.bzbh)" v-if="scope.row.bzbh"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzbh)" v-if="scope.row.bzbh"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="限制范围">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.xzfw)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xzfw)"></span></template>
         </el-table-column>
-        <el-table-column
-          align="header-center"
-          label="所属中心"
-          prop="sszx"
-          column-key="sszx"
-          :filters="groupBy.sszx"
-          :filter-multiple="false"
-        >
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.sszx)"></span
-          ></template>
+        <el-table-column align="header-center" label="所属地点" prop="sszx" column-key="sszx" :filters="groupBy.sszx"
+          :filter-multiple="false">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.sszx)"></span></template>
         </el-table-column>
         <!-- <el-table-column align="center" label="操作">
             <template slot-scope="scope">
@@ -168,67 +89,37 @@
           </el-table-column> -->
       </el-table>
 
-      <pagination
-        v-show="cmaList.count > 0"
-        :total="cmaList.count"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.page_size"
-        @pagination="getList"
-      />
+      <pagination v-show="cmaList.count > 0" :total="cmaList.count" :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size" @pagination="getList" />
     </el-card>
     <el-card style="margin-top: 6px">
       <div slot="header" class="clearfix">
-            <span>实验室认可CNAS</span>
-          </div>
-      <el-table
-        v-loading="listLoading2"
-        :data="cnasList.results"
-        style="width: 100%"
-        border
-        fit
-        stripe
-        highlight-current-row
-        max-height="300"
-        @filter-change="filterChange2"
-      >
+        <span>实验室认可CNAS</span>
+      </div>
+      <el-table v-loading="listLoading2" :data="cnasList.results" style="width: 100%" border fit stripe
+        highlight-current-row max-height="300" @filter-change="filterChange2">
         <el-table-column type="index" width="50" />
         <el-table-column align="header-center" label="类别名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.lbmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.lbmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="项目名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.xmmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xmmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="标准名称">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.bzmc)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzmc)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="标准编号">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.bzbh)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzbh)"></span></template>
         </el-table-column>
         <el-table-column align="header-center" label="标准条款">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.bztk)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bztk)"></span></template>
         </el-table-column>
-        <el-table-column align="header-center" label="限制范围">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.xzfw)"></span
-          ></template>
+        <el-table-column align="header-center" label="说明">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.sm)"></span></template>
         </el-table-column>
-        <el-table-column align="header-center" label="所属地点" prop="sszx"
-          column-key="sszx"
-          :filters="groupBy2.sszx"
+        <el-table-column align="header-center" label="所属地点" prop="sszx" column-key="sszx" :filters="groupBy2.sszx"
           :filter-multiple="false">
-          <template slot-scope="scope"
-            ><span v-html="showlight(scope.row.sszx)"></span
-          ></template>
+          <template slot-scope="scope"><span v-html="showlight(scope.row.sszx)"></span></template>
         </el-table-column>
         <!-- <el-table-column align="center" label="操作">
             <template slot-scope="scope">
@@ -250,24 +141,11 @@
           </el-table-column> -->
       </el-table>
 
-      <pagination
-        v-show="cnasList.count > 0"
-        :total="cnasList.count"
-        :page.sync="listQuery2.page"
-        :limit.sync="listQuery2.page_size"
-        @pagination="getList2"
-      />
+      <pagination v-show="cnasList.count > 0" :total="cnasList.count" :page.sync="listQuery2.page"
+        :limit.sync="listQuery2.page_size" @pagination="getList2" />
     </el-card>
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :title="dialogType === 'edit' ? '编辑' : '新增'"
-    >
-      <el-form
-        ref="Form"
-        :model="cma"
-        label-width="80px"
-        label-position="right"
-      >
+    <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑' : '新增'">
+      <el-form ref="Form" :model="cma" label-width="80px" label-position="right">
         <el-form-item label="姓名" prop="name">
           <el-input v-model="cma.name" placeholder="姓名" />
         </el-form-item>
@@ -353,6 +231,9 @@ export default {
   },
   methods: {
     showlight(val) {
+      if (val == null) {
+        return ""
+      }
       val = val + "";
       if (this.listQuery.search != "") {
         let searchList = this.listQuery.search.split(" ");
@@ -360,8 +241,8 @@ export default {
           val = val.replace(
             searchList[i],
             '<span style="color:red;font-weight:bold">' +
-              searchList[i] +
-              "</span>"
+            searchList[i] +
+            "</span>"
           );
         }
         return val;
diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue
index 9175972..97533e3 100644
--- a/client/src/views/ability/cma2.vue
+++ b/client/src/views/ability/cma2.vue
@@ -1,162 +1,80 @@
 <template>
   <div class="app-container">
     <el-card>
-    <el-row :gutter="6">
-      <el-col :xs="24" :md="4">
-        <el-select
-          v-model="listQuery.sszx"
-          placeholder="所属公司"
-          @change="handleFilter2"
-          clearable
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in groupBy.sszx"
-            :key="item.value"
-            :label="item.text"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
+      <el-row :gutter="6">
+        <el-col :xs="24" :md="4">
+          <el-select v-model="listQuery.sszx" placeholder="所属公司" @change="handleFilter2" clearable style="width: 100%">
+            <el-option v-for="item in groupBy.sszx" :key="item.value" :label="item.text" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
 
-      <el-col :xs="24" :md="8">
-        <el-input
-          v-model="listQuery.search"
-          placeholder="项目/标准/编号/公司"
-          style="width: 100%"
-          class="filter-item"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-col>
-      <el-col :xs="24" :md="6">
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter"
-          >搜索</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter"
-          >重置</el-button
-        >
-      </el-col>
-    </el-row>
-    <div style="margin-top: 10px">
-      <el-popover
-        placement="top"
-        width="160"
-        v-if="checkPermission(['ability_import'])"
-        v-model="popovervisible"
-      >
-        <p>导入能力列表压缩包.</p>
-        <div style="text-align: left; margin: 0">
-          <el-upload
-            :action="upUrl"
-            :on-success="handleUploadSuccess"
-            accept=".zip"
-            :headers="upHeaders"
-            :show-file-list="false"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              @click="popovervisible = false"
-              >上传导入</el-button
-            >
-          </el-upload>
-        </div>
-        <el-button slot="reference">导入分子公司能力</el-button>
-      </el-popover>
-       <el-button @click="delAll()"  v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除</el-button>
-       <el-button @click="delAll2()"  v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除所属公司</el-button>
-    </div>
+        <el-col :xs="24" :md="8">
+          <el-input v-model="listQuery.search" placeholder="项目/标准/编号/公司" style="width: 100%" class="filter-item"
+            @keyup.enter.native="handleFilter" />
+        </el-col>
+        <el-col :xs="24" :md="6">
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-refresh-left" @click="resetFilter">重置</el-button>
+        </el-col>
+      </el-row>
+      <div style="margin-top: 10px">
+        <el-popover placement="top" width="160" v-if="checkPermission(['ability_import'])" v-model="popovervisible">
+          <p>导入能力列表压缩包.</p>
+          <div style="text-align: left; margin: 0">
+            <el-upload :action="upUrl" :on-success="handleUploadSuccess" accept=".zip" :headers="upHeaders"
+              :show-file-list="false">
+              <el-button size="small" type="primary" @click="popovervisible = false">上传导入</el-button>
+            </el-upload>
+          </div>
+          <el-button slot="reference">导入分子公司能力</el-button>
+        </el-popover>
+        <el-button @click="delAll()" v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除</el-button>
+        <el-button @click="delAll2()" v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除所属公司</el-button>
+      </div>
     </el-card>
     <el-card style="margin-top: 10px">
-    <el-table
-      v-loading="listLoading"
-      :data="cmaList.results"
-      style="width: 100%;"
-      border
-      fit
-      stripe
-      highlight-current-row
-      max-height="700"
-      ref="filterTable"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-     <el-table-column
-      type="selection"
-      width="55">
-    </el-table-column>
-      <el-table-column type="index" width="50" />
-      <el-table-column label="大类名称">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.dlmc)" v-if="scope.row.dlmc"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="类别名称">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.lbmc)"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="项目序号">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.xmxh)"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="项目名称">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.xmmc)"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="标准名称" width="300">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.bzmc)"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="标准编号">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.bzbh)" v-if="scope.row.bzbh"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="限制范围">
-        <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.xzfw)" v-if="scope.row.xzfw"></span
-        ></template>
-      </el-table-column>
-      <el-table-column label="创建日期">
-        <template slot-scope="scope">{{scope.row.create_time.substring(0, 10)}}</template>
-      </el-table-column>
-      <el-table-column label="变更日期">
-        <template slot-scope="scope">{{scope.row.update_time.substring(0, 10)}}</template>
-      </el-table-column>
-      <el-table-column
-        label="关联资质"
-        prop="glzz"
-        column-key="glzz"
-        :filters="groupBy.glzz"
-        :filter-multiple="false"
-      >
-        <template slot-scope="scope">{{ scope.row.glzz }}</template>
-      </el-table-column>
-      <el-table-column
-        align="header-center"
-        label="所属中心"
-        prop="sszx"
-        column-key="sszx"
-        :filters="groupBy.sszx"
-        :filter-multiple="false"
-        fixed="right"
-      >
-        <template slot-scope="scope">{{ scope.row.sszx }}</template>
-      </el-table-column>
-      <!-- <el-table-column align="center" label="操作">
+      <el-table v-loading="listLoading" :data="cmaList.results" style="width: 100%;" border fit stripe
+        highlight-current-row max-height="700" ref="filterTable" @selection-change="handleSelectionChange"
+        @filter-change="filterChange">
+        <el-table-column type="selection" width="55">
+        </el-table-column>
+        <el-table-column type="index" width="50" />
+        <el-table-column label="大类名称">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.dlmc)" v-if="scope.row.dlmc"></span></template>
+        </el-table-column>
+        <el-table-column label="类别名称">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.lbmc)"></span></template>
+        </el-table-column>
+        <el-table-column label="项目序号">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xmxh)"></span></template>
+        </el-table-column>
+        <el-table-column label="项目名称">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.xmmc)"></span></template>
+        </el-table-column>
+        <el-table-column label="标准名称" width="300">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzmc)"></span></template>
+        </el-table-column>
+        <el-table-column label="标准编号">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.bzbh)" v-if="scope.row.bzbh"></span></template>
+        </el-table-column>
+        <el-table-column label="说明">
+          <template slot-scope="scope"><span v-html="showlight(scope.row.sm)" v-if="scope.row.sm"></span></template>
+        </el-table-column>
+        <el-table-column label="创建日期">
+          <template slot-scope="scope">{{ scope.row.create_time.substring(0, 10) }}</template>
+        </el-table-column>
+        <el-table-column label="变更日期">
+          <template slot-scope="scope">{{ scope.row.update_time.substring(0, 10) }}</template>
+        </el-table-column>
+        <el-table-column label="关联资质" prop="glzz" column-key="glzz" :filters="groupBy.glzz" :filter-multiple="false">
+          <template slot-scope="scope">{{ scope.row.glzz }}</template>
+        </el-table-column>
+        <el-table-column align="header-center" label="所属中心" prop="sszx" column-key="sszx" :filters="groupBy.sszx"
+          :filter-multiple="false" fixed="right">
+          <template slot-scope="scope">{{ scope.row.sszx }}</template>
+        </el-table-column>
+        <!-- <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <el-button
                 :disabled="!checkPermission(['cma_update'])"
@@ -174,25 +92,12 @@
               />
             </template>
           </el-table-column> -->
-    </el-table>
-    <pagination
-      v-show="cmaList.count > 0"
-      :total="cmaList.count"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.page_size"
-      @pagination="getList"
-    />
+      </el-table>
+      <pagination v-show="cmaList.count > 0" :total="cmaList.count" :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size" @pagination="getList" />
     </el-card>
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :title="dialogType === 'edit' ? '编辑' : '新增'"
-    >
-      <el-form
-        ref="Form"
-        :model="cma"
-        label-width="80px"
-        label-position="right"
-      >
+    <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑' : '新增'">
+      <el-form ref="Form" :model="cma" label-width="80px" label-position="right">
         <el-form-item label="姓名" prop="name">
           <el-input v-model="cma.name" placeholder="姓名" />
         </el-form-item>
@@ -274,7 +179,7 @@ export default {
         let searchList = this.listQuery.search.split(" ");
         let reg = null;
         for (let i = 0; i < searchList.length; i++) {
-         reg=new RegExp(searchList[i],"g");
+          reg = new RegExp(searchList[i], "g");
           val = val.replace(reg, '<span style="color:red;font-weight:bold">' + searchList[i] + '</span>');
         }
         return val;
@@ -363,64 +268,64 @@ export default {
         .catch((err) => {
         });
     },
-   
+
     delAll() {
-         this.$confirm("确认删除?", "警告", {
+      this.$confirm("确认删除?", "警告", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
         type: "error",
       })
         .then(async () => {
-        const length = this.multipleSelection.length;
-        for (let i = 0; i < length; i++) {
-               this.delarr.push(this.multipleSelection[i].id);
-         }
-     
-      let data = { ids: this.delarr };
-      deletes(data)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-           this.getList();
+          const length = this.multipleSelection.length;
+          for (let i = 0; i < length; i++) {
+            this.delarr.push(this.multipleSelection[i].id);
+          }
+
+          let data = { ids: this.delarr };
+          deletes(data)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.getList();
+            })
         })
-     })
         .catch((err) => {
         });
     },
     delAll2() {
       let sszx = this.listQuery.sszx
-          if(sszx==null || sszx==='' || sszx == undefined){
-            this.$message({
-            message: "请选中所属公司",
-            type: "warning",
-          });
-          return
-          }
-         this.$confirm("确认删除?", "警告", {
+      if (sszx == null || sszx === '' || sszx == undefined) {
+        this.$message({
+          message: "请选中所属公司",
+          type: "warning",
+        });
+        return
+      }
+      this.$confirm("确认删除?", "警告", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
         type: "error",
       })
         .then(async () => {
-          
-      let data = { sszx: sszx };
-      deletes(data)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-           this.getList();
+
+          let data = { sszx: sszx };
+          deletes(data)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.getList();
+            })
         })
-     })
         .catch((err) => {
         });
     },
     handleSelectionChange(val) {
-                this.multipleSelection = val;
-            },
+      this.multipleSelection = val;
+    },
     filterChange(obj) {
       for (let key in obj) {
         this.listQuery[key] = obj[key][0];
diff --git a/server/apps/ability/migrations/0038_cnas_sm.py b/server/apps/ability/migrations/0038_cnas_sm.py
new file mode 100644
index 0000000..8d7691e
--- /dev/null
+++ b/server/apps/ability/migrations/0038_cnas_sm.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2024-01-24 09:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ability', '0037_qtask_orgs'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cnas',
+            name='sm',
+            field=models.TextField(blank=True, null=True, verbose_name='说明'),
+        ),
+    ]
diff --git a/server/apps/ability/models.py b/server/apps/ability/models.py
index edfe4e8..17c5cf2 100644
--- a/server/apps/ability/models.py
+++ b/server/apps/ability/models.py
@@ -1,194 +1,194 @@
-
 from apps.system.models import City, Dict, Province
 from django.db import models
 from utils.model import BaseModel
 from apps.system.models import CommonAModel, CommonBModel, File, Organization, User
+
 # Create your models here.
 from django.contrib.postgres.fields import JSONField
 
+
 class Ability(BaseModel):
-    dlxh = models.TextField('大类序号', null=True, blank=True)
-    dlmc = models.TextField('大类', null=True, blank=True)
-    lbxh = models.TextField('类别序号', null=True,blank=True)
-    lbmc = models.TextField('类别名称', null=True,blank=True)
-    xmxh = models.TextField('项目序号', null=True,blank=True)
-    xmmc = models.TextField('项目名称', null=True,blank=True)
-    bzmc = models.TextField('标准名称', null=True,blank=True)
-    bzbh = models.TextField('标准编号', null=True,blank=True)
-    bztk = models.TextField('标准条款', null=True,blank=True)
-    xzfw = models.TextField('限制范围',null=True,blank=True)
-    bz = models.TextField('备注',null=True,blank=True)
-    cma = models.TextField('CMA中心',null=True,blank=True)
+    dlxh = models.TextField("大类序号", null=True, blank=True)
+    dlmc = models.TextField("大类", null=True, blank=True)
+    lbxh = models.TextField("类别序号", null=True, blank=True)
+    lbmc = models.TextField("类别名称", null=True, blank=True)
+    xmxh = models.TextField("项目序号", null=True, blank=True)
+    xmmc = models.TextField("项目名称", null=True, blank=True)
+    bzmc = models.TextField("标准名称", null=True, blank=True)
+    bzbh = models.TextField("标准编号", null=True, blank=True)
+    bztk = models.TextField("标准条款", null=True, blank=True)
+    xzfw = models.TextField("限制范围", null=True, blank=True)
+    bz = models.TextField("备注", null=True, blank=True)
+    cma = models.TextField("CMA中心", null=True, blank=True)
     cma_ok = models.BooleanField(null=True, blank=True)
     cnas_ok = models.BooleanField(null=True, blank=True)
-    cnas = models.TextField('CNAS中心',null=True,blank=True)
-    cma_o = models.TextField('中心',null=True,blank=True)
-    cma_oplace = models.TextField('地点',null=True,blank=True)
-    class Meta:
-        verbose_name='记录合并'
+    cnas = models.TextField("CNAS中心", null=True, blank=True)
+    cma_o = models.TextField("中心", null=True, blank=True)
+    cma_oplace = models.TextField("地点", null=True, blank=True)
 
+    class Meta:
+        verbose_name = "记录合并"
 
 
 class QueryRecord(BaseModel):
-    user = models.ForeignKey(User, related_name='record_user', on_delete=models.CASCADE)
-    path = models.CharField('访问地址', max_length=200)
-    ip = models.CharField('IP地址', max_length=200, null=True, blank=True)
-    method = models.CharField('方法', max_length=100, default='GET')
-    query = JSONField(null=True,blank=True)
-    search = models.TextField('搜索字符', null=True, blank=True)
+    user = models.ForeignKey(User, related_name="record_user", on_delete=models.CASCADE)
+    path = models.CharField("访问地址", max_length=200)
+    ip = models.CharField("IP地址", max_length=200, null=True, blank=True)
+    method = models.CharField("方法", max_length=100, default="GET")
+    query = JSONField(null=True, blank=True)
+    search = models.TextField("搜索字符", null=True, blank=True)
 
     class Meta:
-        verbose_name = '查询记录'
+        verbose_name = "查询记录"
         verbose_name_plural = verbose_name
 
+
 class Correct(BaseModel):
-    dlxh = models.TextField('大类序号', null=True,blank=True)
-    dlmc = models.TextField('大类', null=True,blank=True)
-    lbxh = models.TextField('类别序号', null=True,blank=True)
-    lbmc = models.TextField('类别名称', null=True,blank=True)
-    bclxh = models.TextField('被测量序号', null=True,blank=True)
-    bclmc = models.TextField('被测量名称', null=True,blank=True)
-    jzgc = models.TextField('校准规程', null=True, blank=True)
-    clfw = models.TextField('测量范围', null=True, blank=True)
-    zqddj = models.TextField('准确度等级', null=True, blank=True)
-    note = models.TextField('说明', null=True, blank=True)
-    ssgs = models.TextField('所属公司', null=True, blank=True)
-    ssbm = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, blank=True, related_name='correct_ssbm')
-    
+    dlxh = models.TextField("大类序号", null=True, blank=True)
+    dlmc = models.TextField("大类", null=True, blank=True)
+    lbxh = models.TextField("类别序号", null=True, blank=True)
+    lbmc = models.TextField("类别名称", null=True, blank=True)
+    bclxh = models.TextField("被测量序号", null=True, blank=True)
+    bclmc = models.TextField("被测量名称", null=True, blank=True)
+    jzgc = models.TextField("校准规程", null=True, blank=True)
+    clfw = models.TextField("测量范围", null=True, blank=True)
+    zqddj = models.TextField("准确度等级", null=True, blank=True)
+    note = models.TextField("说明", null=True, blank=True)
+    ssgs = models.TextField("所属公司", null=True, blank=True)
+    ssbm = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, blank=True, related_name="correct_ssbm")
+
     class Meta:
-        verbose_name='校验能力'
-        verbose_name_plural=verbose_name
+        verbose_name = "校验能力"
+        verbose_name_plural = verbose_name
+
 
 class CMA(BaseModel):
     """
     CMA检测能力表
     """
-    type_choices = (
-        ('center', '总部'),
-        ('sub', '分子公司')
-    )
-    dlxh = models.TextField('大类序号', null=True,blank=True)
-    dlmc = models.TextField('大类', null=True,blank=True)
-    lbxh = models.TextField('类别序号', null=True,blank=True)
-    lbmc = models.TextField('类别名称', null=True,blank=True)
-    xmxh = models.TextField('项目序号', null=True,blank=True)
-    xmmc = models.TextField('项目名称', null=True,blank=True)
-    bzmc = models.TextField('标准名称', null=True,blank=True)
-    bzbh = models.TextField('标准编号', null=True,blank=True)
-    xzfw = models.TextField('限制范围',null=True,blank=True)
-    bz = models.TextField('备注',null=True,blank=True)
-    sszx = models.TextField('所属中心',null=True,blank=True)
-    type = models.CharField('所属类型', max_length=50,
-                             choices=type_choices, default='center')
-    glzz = models.TextField('关联资质', null=True, blank=True)
+
+    type_choices = (("center", "总部"), ("sub", "分子公司"))
+    dlxh = models.TextField("大类序号", null=True, blank=True)
+    dlmc = models.TextField("大类", null=True, blank=True)
+    lbxh = models.TextField("类别序号", null=True, blank=True)
+    lbmc = models.TextField("类别名称", null=True, blank=True)
+    xmxh = models.TextField("项目序号", null=True, blank=True)
+    xmmc = models.TextField("项目名称", null=True, blank=True)
+    bzmc = models.TextField("标准名称", null=True, blank=True)
+    bzbh = models.TextField("标准编号", null=True, blank=True)
+    xzfw = models.TextField("限制范围", null=True, blank=True)
+    bz = models.TextField("备注", null=True, blank=True)
+    sszx = models.TextField("所属中心", null=True, blank=True)
+    type = models.CharField("所属类型", max_length=50, choices=type_choices, default="center")
+    glzz = models.TextField("关联资质", null=True, blank=True)
+
 
 class Inspection(BaseModel):
     """
     检验能力表
     """
-    
-    dlxh = models.TextField('大类序号', null=True,blank=True)
-    dlmc = models.TextField('大类名称', null=True,blank=True)
-    dxxh = models.TextField('对象序号', null=True,blank=True)
-    jydx = models.TextField('检验对象', null=True,blank=True)
-    jyxmxh = models.TextField('检验项目序号', null=True,blank=True)
-    jyxmmc = models.TextField('检验项目名称', null=True,blank=True)
-    jybz = models.TextField('检验标准', null=True,blank=True)
-    sm = models.TextField('说明', null=True,blank=True)
-    sxrq = models.TextField('生效日期', null=True,blank=True)
-    sszx = models.TextField('所属中心',null=True,blank=True)
+
+    dlxh = models.TextField("大类序号", null=True, blank=True)
+    dlmc = models.TextField("大类名称", null=True, blank=True)
+    dxxh = models.TextField("对象序号", null=True, blank=True)
+    jydx = models.TextField("检验对象", null=True, blank=True)
+    jyxmxh = models.TextField("检验项目序号", null=True, blank=True)
+    jyxmmc = models.TextField("检验项目名称", null=True, blank=True)
+    jybz = models.TextField("检验标准", null=True, blank=True)
+    sm = models.TextField("说明", null=True, blank=True)
+    sxrq = models.TextField("生效日期", null=True, blank=True)
+    sszx = models.TextField("所属中心", null=True, blank=True)
+
 
 class CNAS(BaseModel):
     """
     CNAS检测能力表
     """
-    lbmc = models.TextField('类别名称', null=True,blank=True)
-    xmmc = models.TextField('项目名称', null=True,blank=True)
-    bzmc = models.TextField('标准名称', null=True,blank=True)
-    bzbh = models.TextField('标准编号', null=True,blank=True)
-    bztk = models.TextField('标准条款', null=True,blank=True)
-    sszx = models.TextField('所属中心',null=True,blank=True)
+
+    lbmc = models.TextField("类别名称", null=True, blank=True)
+    xmmc = models.TextField("项目名称", null=True, blank=True)
+    bzmc = models.TextField("标准名称", null=True, blank=True)
+    bzbh = models.TextField("标准编号", null=True, blank=True)
+    bztk = models.TextField("标准条款", null=True, blank=True)
+    sszx = models.TextField("所属中心", null=True, blank=True)
+    sm = models.TextField("说明", null=True, blank=True)
+
 
 class Qualification(BaseModel):
-    sszx = models.TextField('所属中心', null=True, blank=True)
-    ssbm = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, blank=True, related_name='qualification_ssbm')
-    cma = models.TextField('cma资质', null=True, blank=True)
-    cnas = models.TextField('cnas资质', null=True, blank=True)
-    other = models.TextField('检验检测相关其它资质', null=True, blank=True)
-    service = models.TextField('主要检验检测服务', null=True, blank=True)
+    sszx = models.TextField("所属中心", null=True, blank=True)
+    ssbm = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, blank=True, related_name="qualification_ssbm")
+    cma = models.TextField("cma资质", null=True, blank=True)
+    cnas = models.TextField("cnas资质", null=True, blank=True)
+    other = models.TextField("检验检测相关其它资质", null=True, blank=True)
+    service = models.TextField("主要检验检测服务", null=True, blank=True)
+
 
 class Qualificationother(BaseModel):
-    qualification = models.ForeignKey(Qualification, on_delete=models.CASCADE, related_name='other_qualification')
-    name = models.TextField('其他资质', null=True, blank=True)
-    description = models.TextField('资质范围', null=True, blank=True)
+    qualification = models.ForeignKey(Qualification, on_delete=models.CASCADE, related_name="other_qualification")
+    name = models.TextField("其他资质", null=True, blank=True)
+    description = models.TextField("资质范围", null=True, blank=True)
+
 
 class QualiLib(BaseModel):
     """
     资质库
     """
-    name = models.CharField('名称', max_length=20)
-    levels = JSONField('等级', default=list, null=True, blank=True)
-    scopes = JSONField('范围', default=list, null=True, blank=True)
+
+    name = models.CharField("名称", max_length=20)
+    levels = JSONField("等级", default=list, null=True, blank=True)
+    scopes = JSONField("范围", default=list, null=True, blank=True)
 
 
 class Quali(CommonAModel):
     """
     资质
     """
-    QUALI_TYPE_CHOICES=(
-        ('CMA', 'CMA'),
-        ('CNAS', 'CNAS'),
-        ('OTHER', 'OTHER')
-    )
-    QUALI_GRADE_CHOICES = (
-        (10, '国家级'),
-        (20, '省级'),
-        (30, '市级'),
-        (40, '实验室'),
-        (50, '检验机构')
-    )
-    org = models.ForeignKey(Organization, on_delete=models.CASCADE, verbose_name='所属单位')
-    name = models.CharField('资质名称', max_length=20, null=True, blank=True)
-    type = models.CharField('资质类型', choices=QUALI_TYPE_CHOICES, max_length=10)
-    grade = models.PositiveSmallIntegerField('等级1', null=True, blank=True, choices=QUALI_GRADE_CHOICES)
-    scope = models.TextField('范围', null=True, blank=True)
-    level = models.CharField('等级2', max_length=10, null=True, blank=True)
+
+    QUALI_TYPE_CHOICES = (("CMA", "CMA"), ("CNAS", "CNAS"), ("OTHER", "OTHER"))
+    QUALI_GRADE_CHOICES = ((10, "国家级"), (20, "省级"), (30, "市级"), (40, "实验室"), (50, "检验机构"))
+    org = models.ForeignKey(Organization, on_delete=models.CASCADE, verbose_name="所属单位")
+    name = models.CharField("资质名称", max_length=20, null=True, blank=True)
+    type = models.CharField("资质类型", choices=QUALI_TYPE_CHOICES, max_length=10)
+    grade = models.PositiveSmallIntegerField("等级1", null=True, blank=True, choices=QUALI_GRADE_CHOICES)
+    scope = models.TextField("范围", null=True, blank=True)
+    level = models.CharField("等级2", max_length=10, null=True, blank=True)
     province = models.ForeignKey(Province, on_delete=models.SET_NULL, null=True, blank=True)
-    city = models.ForeignKey(City, on_delete=models.SET_NULL, null=True, blank=True, related_name='quali_city')
-    citys = models.ManyToManyField(City, verbose_name='备案城市', related_name='quali_citys', blank=True)
-    description = models.TextField('描述', null=True, blank=True)
-    qualilib = models.ForeignKey(QualiLib, verbose_name='关联资质库',
-                                 null=True, blank=True, on_delete=models.SET_NULL)
-    end_date = models.DateField('截至日期', null=True, blank=True)
-    file = models.ForeignKey(File, null=True, blank=True, verbose_name='关联文件', on_delete=models.CASCADE)
-    
+    city = models.ForeignKey(City, on_delete=models.SET_NULL, null=True, blank=True, related_name="quali_city")
+    citys = models.ManyToManyField(City, verbose_name="备案城市", related_name="quali_citys", blank=True)
+    description = models.TextField("描述", null=True, blank=True)
+    qualilib = models.ForeignKey(QualiLib, verbose_name="关联资质库", null=True, blank=True, on_delete=models.SET_NULL)
+    end_date = models.DateField("截至日期", null=True, blank=True)
+    file = models.ForeignKey(File, null=True, blank=True, verbose_name="关联文件", on_delete=models.CASCADE)
 
 
 class QTask(CommonBModel):
     """
     资质报送任务
     """
+
     state_choices = (
-        ('待发布', '待发布'),
-        ('进行中', '进行中'),
-        ('已关闭', '已关闭'),
+        ("待发布", "待发布"),
+        ("进行中", "进行中"),
+        ("已关闭", "已关闭"),
     )
-    name = models.CharField('名称', max_length=100)
-    end_date = models.DateField('截止时间', null=True, blank=True)
-    state = models.CharField('任务状态', max_length=50, choices=state_choices, default='待发布')
-    orgs = models.ManyToManyField(Organization, through='ability.qorg')
+    name = models.CharField("名称", max_length=100)
+    end_date = models.DateField("截止时间", null=True, blank=True)
+    state = models.CharField("任务状态", max_length=50, choices=state_choices, default="待发布")
+    orgs = models.ManyToManyField(Organization, through="ability.qorg")
+
     class Meta:
-        verbose_name = '资质报送任务'
+        verbose_name = "资质报送任务"
         verbose_name_plural = verbose_name
 
 
 class QOrg(BaseModel):
-    qtask = models.ForeignKey(QTask, verbose_name='关联任务', on_delete=models.CASCADE, related_name='qorg_qtask')
-    org = models.ForeignKey(Organization, verbose_name='关联公司', on_delete=models.CASCADE, related_name='qorg_org')
+    qtask = models.ForeignKey(QTask, verbose_name="关联任务", on_delete=models.CASCADE, related_name="qorg_qtask")
+    org = models.ForeignKey(Organization, verbose_name="关联公司", on_delete=models.CASCADE, related_name="qorg_org")
     count = models.PositiveIntegerField(default=0)
     count_confirmed = models.PositiveIntegerField(default=0)
+
     class Meta:
-        verbose_name = '资质报送任务部门'
+        verbose_name = "资质报送任务部门"
         verbose_name_plural = verbose_name
 
 
@@ -196,43 +196,39 @@ class QAction(CommonBModel):
     """
     任务操作
     """
+
     QACTION_CHOICE = (
-        ('service:update', '更新服务'),
-        ('quali:create', '新增资质'),
-        ('quali:update', '更新资质'),
-        ('ablity:create', '新增能力'),
-        ('ablity:nochange', '能力无变化'),
-        ('quali:nochange', '资质无变化')
+        ("service:update", "更新服务"),
+        ("quali:create", "新增资质"),
+        ("quali:update", "更新资质"),
+        ("ablity:create", "新增能力"),
+        ("ablity:nochange", "能力无变化"),
+        ("quali:nochange", "资质无变化"),
     )
-    action = models.CharField('操作类型', max_length=20, choices=QACTION_CHOICE)
-    quali = models.ForeignKey(Quali, null=True, blank=True, verbose_name='操作资质', on_delete=models.CASCADE)
-    file = models.ForeignKey(File, null=True, blank=True, verbose_name='能力文件', on_delete=models.CASCADE)
-    atype = models.ForeignKey(Dict, null=True, blank=True, verbose_name='能力类型',
-                              on_delete=models.CASCADE, related_name='quali_atype')
-    afield = models.ForeignKey(Dict, null=True, blank=True, verbose_name='所属领域',
-                               on_delete=models.CASCADE, related_name='quali_afield')
-    num = models.PositiveIntegerField('新增对象数量', null=True, blank=True)
-    num2 = models.PositiveIntegerField('新增参数数量', null=True, blank=True)
-    num3 = models.PositiveIntegerField('新增方法标准数量', null=True, blank=True)
-    num4 = models.PositiveIntegerField('新增产品标准数量', null=True, blank=True)
+    action = models.CharField("操作类型", max_length=20, choices=QACTION_CHOICE)
+    quali = models.ForeignKey(Quali, null=True, blank=True, verbose_name="操作资质", on_delete=models.CASCADE)
+    file = models.ForeignKey(File, null=True, blank=True, verbose_name="能力文件", on_delete=models.CASCADE)
+    atype = models.ForeignKey(Dict, null=True, blank=True, verbose_name="能力类型", on_delete=models.CASCADE, related_name="quali_atype")
+    afield = models.ForeignKey(Dict, null=True, blank=True, verbose_name="所属领域", on_delete=models.CASCADE, related_name="quali_afield")
+    num = models.PositiveIntegerField("新增对象数量", null=True, blank=True)
+    num2 = models.PositiveIntegerField("新增参数数量", null=True, blank=True)
+    num3 = models.PositiveIntegerField("新增方法标准数量", null=True, blank=True)
+    num4 = models.PositiveIntegerField("新增产品标准数量", null=True, blank=True)
     qtask = models.ForeignKey(QTask, on_delete=models.CASCADE)
-    value1 = JSONField('值1', null=True, blank=True, default=dict)
-    value2 = JSONField('值2', null=True, blank=True, default=dict)
-    confirmed = models.BooleanField('是否确认',default=False)
+    value1 = JSONField("值1", null=True, blank=True, default=dict)
+    value2 = JSONField("值2", null=True, blank=True, default=dict)
+    confirmed = models.BooleanField("是否确认", default=False)
 
 
 class QActionItem(BaseModel):
     QACTIONITEM_CHOICE = (
-        ('update', '更新'),
-        ('citys:add', '新增备案城市'),
-        ('citys:remove', '移除备案城市'),
+        ("update", "更新"),
+        ("citys:add", "新增备案城市"),
+        ("citys:remove", "移除备案城市"),
     )
-    action = models.CharField('操作类型', max_length=20, choices=QACTIONITEM_CHOICE)
-    field = models.CharField('变动字段', max_length=20)
-    value1 = JSONField('原值', null=True, blank=True, default=dict)
-    value2 = JSONField('新值', null=True, blank=True, default=dict)
+    action = models.CharField("操作类型", max_length=20, choices=QACTIONITEM_CHOICE)
+    field = models.CharField("变动字段", max_length=20)
+    value1 = JSONField("原值", null=True, blank=True, default=dict)
+    value2 = JSONField("新值", null=True, blank=True, default=dict)
     city = models.ForeignKey(City, on_delete=models.SET_NULL, null=True, blank=True)
-    qaction = models.ForeignKey(QAction, verbose_name='关联操作',
-                                on_delete=models.CASCADE, related_name='items_qaction', null=True, blank=True)
-
-
+    qaction = models.ForeignKey(QAction, verbose_name="关联操作", on_delete=models.CASCADE, related_name="items_qaction", null=True, blank=True)
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index 80615ec..f8bf51a 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -24,227 +24,239 @@ from django.utils import timezone
 from apps.supervision.permission import RecordPermission
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
+
 # Create your views here.
 import json
 
-class RecordMixin():
-    def perform_authentication(self, request):
-            """
-            Perform authentication on the incoming request.
 
-            Note that if you override this and simply 'pass', then authentication
-            will instead be performed lazily, the first time either
-            `request.user` or `request.auth` is accessed.
-            """
-            if request.user and request.method == 'GET' and request.user.username != 'admin':
-                QueryRecord.objects.create(user=request.user,path=request.path,ip=request.META.get('HTTP_X_FORWARDED_FOR'),method=\
-                    request.method,search=request.query_params.get('search',None),query=request.query_params)
+class RecordMixin:
+    def perform_authentication(self, request):
+        """
+        Perform authentication on the incoming request.
+
+        Note that if you override this and simply 'pass', then authentication
+        will instead be performed lazily, the first time either
+        `request.user` or `request.auth` is accessed.
+        """
+        if request.user and request.method == "GET" and request.user.username != "admin":
+            QueryRecord.objects.create(
+                user=request.user, path=request.path, ip=request.META.get("HTTP_X_FORWARDED_FOR"), method=request.method, search=request.query_params.get("search", None), query=request.query_params
+            )
+
 
 class AbilityContentViewSet(CreateUpdateCustomMixin, ModelViewSet):
     """
     资质能力报送清单：增删改查
     """
-    perms_map = {'get': '*', 'post': 'content',
-                 'put': 'content', 'delete': 'content'}
+
+    perms_map = {"get": "*", "post": "content", "put": "content", "delete": "content"}
     queryset = Content.objects.filter(cate=2)
     serializer_class = ContentSerializer
     pagination_class = None
-    search_fields = ['name', 'desc']
-    filterset_fields = ['type','cate']
-    ordering = ['sortnum', 'create_time']
+    search_fields = ["name", "desc"]
+    filterset_fields = ["type", "cate"]
+    ordering = ["sortnum", "create_time"]
 
     def perform_create(self, serializer):
-        if hasattr(self.queryset.model, 'belong_dept'):
-            serializer.save(create_by = self.request.user, belong_dept=self.request.user.dept, cate=2)
+        if hasattr(self.queryset.model, "belong_dept"):
+            serializer.save(create_by=self.request.user, belong_dept=self.request.user.dept, cate=2)
         else:
-            serializer.save(create_by = self.request.user, cate=2)
+            serializer.save(create_by=self.request.user, cate=2)
+
     def perform_update(self, serializer):
-        serializer.save(update_by = self.request.user)
+        serializer.save(update_by=self.request.user)
+
 
 class AbilityRecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
-    perms_map = {'get': '*', 'post': '*',
-                 'put': '*', 'delete': '*'}
+    perms_map = {"get": "*", "post": "*", "put": "*", "delete": "*"}
     queryset = Record.objects.filter(content__cate=2)
     serializer_class = RecordSerializer
-    search_fields = ['content__name']
-    ordering_fields = ['content__sortnum', 'belong_dept__sort']
-    ordering = ['-task', 'content__sortnum', '-create_time']
-    filterset_fields = ['content','content__cate', 'belong_dept', 'state']
+    search_fields = ["content__name"]
+    ordering_fields = ["content__sortnum", "belong_dept__sort"]
+    ordering = ["-task", "content__sortnum", "-create_time"]
+    filterset_fields = ["content", "content__cate", "belong_dept", "state"]
 
     def filter_queryset(self, queryset):
-        if not self.request.query_params.get('pageoff', None):
-            queryset = queryset.exclude(state='待发布')
+        if not self.request.query_params.get("pageoff", None):
+            queryset = queryset.exclude(state="待发布")
         return super().filter_queryset(queryset)
 
     def get_serializer_class(self):
-        if self.action == 'create':
+        if self.action == "create":
             return RecordCreateSerializer
         return super().get_serializer_class()
 
-    @action(methods=['put'], detail=True, perms_map = {'put':'record_up'})
+    @action(methods=["put"], detail=True, perms_map={"put": "record_up"})
     def up(self, request, *args, **kwargs):
         """
         报送
         """
         obj = self.get_object()
-        if obj.state in ['待整改','待报送', '已报送']:
+        if obj.state in ["待整改", "待报送", "已报送"]:
             obj.files.clear()
-            obj.files.add(*request.data['files'])
-            obj.noteb = request.data['noteb']
-            obj.state = '已报送'
+            obj.files.add(*request.data["files"])
+            obj.noteb = request.data["noteb"]
+            obj.state = "已报送"
             obj.up_user = request.user
             obj.up_date = timezone.now()
             obj.save()
             return Response(status=status.HTTP_200_OK)
-        return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
+        return Response("记录状态错误", status=status.HTTP_400_BAD_REQUEST)
 
     def create(self, request, *args, **kwargs):
         """
         主动报送
         """
         data = request.data
-        if data.get('files', None):
+        if data.get("files", None):
             serializer = RecordCreateSerializer(data=data)
             serializer.is_valid(raise_exception=True)
-            content = Content.objects.get(pk=data['content'])
-            if content.cate==2:
-                sdata = {'belong_dept':request.user.dept, 
-                'is_self':True, 
-                'content_name':content.name, 
-                'content_desc':content.desc, 
-                'state':'已报送',
-                'up_user':request.user,
-                'up_date':timezone.now()}
+            content = Content.objects.get(pk=data["content"])
+            if content.cate == 2:
+                sdata = {
+                    "belong_dept": request.user.dept,
+                    "is_self": True,
+                    "content_name": content.name,
+                    "content_desc": content.desc,
+                    "state": "已报送",
+                    "up_user": request.user,
+                    "up_date": timezone.now(),
+                }
                 serializer.save(**sdata)
                 return Response(status=status.HTTP_201_CREATED)
-            return Response('该材料不是资质能力!', status=status.HTTP_400_BAD_REQUEST)
-        return Response('未上传文件', status=status.HTTP_400_BAD_REQUEST)
-    
-    @action(methods=['put'], detail=True, perms_map = {'put':'record_reject'}, permission_classes=[RecordPermission])
+            return Response("该材料不是资质能力!", status=status.HTTP_400_BAD_REQUEST)
+        return Response("未上传文件", status=status.HTTP_400_BAD_REQUEST)
+
+    @action(methods=["put"], detail=True, perms_map={"put": "record_reject"}, permission_classes=[RecordPermission])
     def reject(self, request, *args, **kwargs):
         """
         驳回
         """
         obj = self.get_object()
-        if obj.state == '已报送':
-            if request.data.get('opinion', None):
-                obj.opinion = request.data['opinion']
-                obj.state = '待整改'
+        if obj.state == "已报送":
+            if request.data.get("opinion", None):
+                obj.opinion = request.data["opinion"]
+                obj.state = "待整改"
                 obj.save()
                 return Response(status=status.HTTP_200_OK)
             else:
-                return Response('请填写修改意见', status=status.HTTP_400_BAD_REQUEST)
-        return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
-    
-    @action(methods=['put'], detail=True, perms_map = {'put':'record_confirm'})
+                return Response("请填写修改意见", status=status.HTTP_400_BAD_REQUEST)
+        return Response("记录状态错误", status=status.HTTP_400_BAD_REQUEST)
+
+    @action(methods=["put"], detail=True, perms_map={"put": "record_confirm"})
     def confirm(self, request, *args, **kwargs):
         """
         确认
         """
         obj = self.get_object()
-        if obj.state in ['已报送', '待报送']:
-            obj.state = '已确认'
+        if obj.state in ["已报送", "待报送"]:
+            obj.state = "已确认"
             obj.save()
             return Response(status=status.HTTP_200_OK)
-        return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
+        return Response("记录状态错误", status=status.HTTP_400_BAD_REQUEST)
 
 
 class QueryRecordListViewSet(ListModelMixin, GenericViewSet):
-    perms_map = {'get': 'queryrecord_view'}
+    perms_map = {"get": "queryrecord_view"}
     queryset = QueryRecord.objects.all()
     serializer_class = QueryRecordSerializer
-    search_fields = ['user__name', 'user__dept__name']
-    ordering = ['-create_time']
-    
+    search_fields = ["user__name", "user__dept__name"]
+    ordering = ["-create_time"]
+
+
 class CMAViewSet(RecordMixin, ModelViewSet):
     """
     CMA检测能力：增删改查
     """
-    perms_map = {'get': 'cma_view', 'post': 'cma_create',
-                 'put': 'cma_update', 'delete': 'cma_delete'}
+
+    perms_map = {"get": "cma_view", "post": "cma_create", "put": "cma_update", "delete": "cma_delete"}
     queryset = CMA.objects.all()
     serializer_class = CMASerializer
-    search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'glzz', 'dlmc']
-    filterset_fields = ['sszx', 'type', 'glzz']
-    ordering_fields = ['sszx', 'dlxh', 'lbxh', 'xmxh']
-    ordering = ['create_time', 'xmxh']
+    search_fields = ["bzbh", "bzmc", "sszx", "xmmc", "glzz", "dlmc"]
+    filterset_fields = ["sszx", "type", "glzz"]
+    ordering_fields = ["sszx", "dlxh", "lbxh", "xmxh"]
+    ordering = ["create_time", "xmxh"]
 
-    @action(methods=['get'], detail=False,url_name='cma_group_by', perms_map = {'*':'*'})
+    @action(methods=["get"], detail=False, url_name="cma_group_by", perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
             group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by(group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
-    @action(methods=['post'], detail=False, url_path='deletes', url_name='cma_deletes', perms_map = {'post':'cma_deletes'})    
+
+    @action(methods=["post"], detail=False, url_path="deletes", url_name="cma_deletes", perms_map={"post": "cma_deletes"})
     def deletes(self, request):
-        
-        array = request.data.get('ids', []) 
-        sszx = request.data.get('sszx', None)
+        array = request.data.get("ids", [])
+        sszx = request.data.get("sszx", None)
         if array:
             CMA.objects.filter(pk__in=array).delete()
-            
+
         elif sszx:
             CMA.objects.filter(sszx=sszx).delete()
-        return Response(status = status.HTTP_200_OK)
-    
-    @action(methods=['post'], detail=False, url_path='import', url_name='cma_import', perms_map = {'post':'cma_import'})
+        return Response(status=status.HTTP_200_OK)
+
+    @action(methods=["post"], detail=False, url_path="import", url_name="cma_import", perms_map={"post": "cma_import"})
     def cma_import(self, request, pk=None):
         """
         导入能力
         """
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
         import os
-        if fullpath.endswith('.rar'):
+
+        if fullpath.endswith(".rar"):
             rar = rarfile.RarFile(fullpath)
-            fulldir = fullpath.replace('.rar','')
+            fulldir = fullpath.replace(".rar", "")
             os.mkdir(fulldir)
             os.chdir(fulldir)
             rar.extractall()
             rar.close()
-            CMA.objects.filter(type='center').delete()
+            CMA.objects.filter(type="center").delete()
             for root, dirs, files in os.walk(fulldir):
                 for f in files:
-                    if f.endswith('.xlsx'):
-                        import_cma(f, os.path.join(root,f))
+                    if f.endswith(".xlsx"):
+                        import_cma(f, os.path.join(root, f))
                     else:
-                        return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        elif fullpath.endswith('.zip'):
-            fulldir = fullpath.replace('.zip','')
+                        return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        elif fullpath.endswith(".zip"):
+            fulldir = fullpath.replace(".zip", "")
             if os.path.exists(fulldir):
-               import shutil
-               shutil.rmtree(fulldir) # 先删除该文件夹
+                import shutil
+
+                shutil.rmtree(fulldir)  # 先删除该文件夹
             os.mkdir(fulldir)
             os.chdir(fulldir)
-            CMA.objects.filter(type='center').delete()
-            with zipfile.ZipFile(fullpath,'r') as zzz:
+            CMA.objects.filter(type="center").delete()
+            with zipfile.ZipFile(fullpath, "r") as zzz:
                 zzz.extractall(fulldir)
                 for root, dirs, files in os.walk(fulldir):
                     for f in files:
-                        if f.endswith('.xlsx'):
-                            import_cma(f.encode('cp437').decode('gbk'), os.path.join(root,f))
+                        if f.endswith(".xlsx"):
+                            import_cma(f.encode("cp437").decode("gbk"), os.path.join(root, f))
                         else:
-                            return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        return Response(status = status.HTTP_200_OK)
-    @action(methods=['post'], detail=False, url_path='import2', url_name='cma_import2', perms_map = {'post':'cma_import2'})
+                            return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        return Response(status=status.HTTP_200_OK)
+
+    @action(methods=["post"], detail=False, url_path="import2", url_name="cma_import2", perms_map={"post": "cma_import2"})
     def cma_import2(self, request, pk=None):
         """
         导入能力2
         """
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
         import os
-        if fullpath.endswith('.rar'):
+
+        if fullpath.endswith(".rar"):
             rar = rarfile.RarFile(fullpath)
-            fulldir = fullpath.replace('.rar','')
+            fulldir = fullpath.replace(".rar", "")
             os.mkdir(fulldir)
             os.chdir(fulldir)
             rar.extractall()
@@ -252,163 +264,169 @@ class CMAViewSet(RecordMixin, ModelViewSet):
             # CMA.objects.filter(type='sub').delete()
             for root, dirs, files in os.walk(fulldir):
                 for f in files:
-                    if f.endswith('.xlsx'):
-                        import_cma2(f, os.path.join(root,f))
+                    if f.endswith(".xlsx"):
+                        import_cma2(f, os.path.join(root, f))
                     else:
-                        return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        elif fullpath.endswith('.zip'):
-            fulldir = fullpath.replace('.zip','')
+                        return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        elif fullpath.endswith(".zip"):
+            fulldir = fullpath.replace(".zip", "")
             if os.path.exists(fulldir):
-               import shutil
-               shutil.rmtree(fulldir) # 先删除该文件夹
+                import shutil
+
+                shutil.rmtree(fulldir)  # 先删除该文件夹
             os.mkdir(fulldir)
             os.chdir(fulldir)
             # CMA.objects.filter(type='sub').delete()
-            with zipfile.ZipFile(fullpath,'r') as zzz:
+            with zipfile.ZipFile(fullpath, "r") as zzz:
                 zzz.extractall(fulldir)
                 for root, dirs, files in os.walk(fulldir):
                     for f in files:
-                        if f.endswith('.xlsx'):
-                            import_cma2(f.encode('cp437').decode('gbk'), os.path.join(root,f))
+                        if f.endswith(".xlsx"):
+                            import_cma2(f.encode("cp437").decode("gbk"), os.path.join(root, f))
                         else:
-                            return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        return Response(status = status.HTTP_200_OK)
+                            return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        return Response(status=status.HTTP_200_OK)
+
 
 from django.db.models.query import QuerySet
+
+
 class QualificationViewSet(RecordMixin, ModelViewSet):
     """
     资质能力：增删改查
     """
-    perms_map = {'get': 'qualification_view', 'post': 'qualificaiton_create',
-                 'put': 'qualification_update', 'delete': 'qualification_delete'}
+
+    perms_map = {"get": "qualification_view", "post": "qualificaiton_create", "put": "qualification_update", "delete": "qualification_delete"}
     queryset = Qualification.objects.all()
     serializer_class = QualificationSerializer
-    search_fields = ['cma', 'cnas', 'sszx', 'other', 'service']
-    ordering_fields = ['sszx']
-    ordering = ['sszx']
-    filterset_fields = ['sszx']
+    search_fields = ["cma", "cnas", "sszx", "other", "service"]
+    ordering_fields = ["sszx"]
+    ordering = ["sszx"]
+    filterset_fields = ["sszx"]
 
     def get_queryset(self):
-        assert self.queryset is not None, (
-            "'%s' should either include a `queryset` attribute, "
-            "or override the `get_queryset()` method."
-            % self.__class__.__name__
-        )
+        assert self.queryset is not None, "'%s' should either include a `queryset` attribute, " "or override the `get_queryset()` method." % self.__class__.__name__
 
         queryset = self.queryset
         if isinstance(queryset, QuerySet):
             # Ensure queryset is re-evaluated on each request.
             queryset = queryset.all()
-        if hasattr(self.get_serializer_class(), 'setup_eager_loading'):
+        if hasattr(self.get_serializer_class(), "setup_eager_loading"):
             queryset = self.get_serializer_class().setup_eager_loading(queryset)
         return queryset
-    @action(methods=['get'], detail=False,url_name='qualification_group_by', perms_map = {'*':'*'})
+
+    @action(methods=["get"], detail=False, url_name="qualification_group_by", perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
             group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by(group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
 
-    @action(methods=['post'], detail=False, url_path='import', url_name='qualification_import', perms_map = {'post':'qualification_import'})
+    @action(methods=["post"], detail=False, url_path="import", url_name="qualification_import", perms_map={"post": "qualification_import"})
     def qualification_import(self, request, pk=None):
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
-        if fullpath.endswith('.xlsx'):
+        if fullpath.endswith(".xlsx"):
             import_qualification(fullpath)
-            return Response(status = status.HTTP_200_OK)
+            return Response(status=status.HTTP_200_OK)
         else:
-            return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-class QualificationotherViewSet(RecordMixin, PageOrNot,ModelViewSet):
+            return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+
+
+class QualificationotherViewSet(RecordMixin, PageOrNot, ModelViewSet):
     """
     资质能力：增删改查
     """
-    perms_map = {'get': 'qualification_view', 'post': 'qualificationother_create',
-                 'put': 'qualificationother_update', 'delete': 'qualificationother_delete'}
+
+    perms_map = {"get": "qualification_view", "post": "qualificationother_create", "put": "qualificationother_update", "delete": "qualificationother_delete"}
     queryset = Qualificationother.objects.all()
     serializer_class = QualificationotherSerializer
-    search_fields = ['qualification__cma', 'name','description','qualification__cnas', 'qualification__ssbm__id',  'qualification__service']
-    filterset_fields = ['qualification__ssbm__name']
-    ordering_fields = ['qualification__ssbm__name']
-    ordering = ['create_time']
+    search_fields = ["qualification__cma", "name", "description", "qualification__cnas", "qualification__ssbm__id", "qualification__service"]
+    filterset_fields = ["qualification__ssbm__name"]
+    ordering_fields = ["qualification__ssbm__name"]
+    ordering = ["create_time"]
 
-    @method_decorator(cache_page(60*60*2))
+    @method_decorator(cache_page(60 * 60 * 2))
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
-    @action(methods=['post'], detail=False, url_path='deletes', url_name='qualificationother_deletes', perms_map = {'post':'qualificationother_deletes'})    
+    @action(methods=["post"], detail=False, url_path="deletes", url_name="qualificationother_deletes", perms_map={"post": "qualificationother_deletes"})
     def deletes(self, request):
-        
-        array = request.data['ids']  
+        array = request.data["ids"]
         Qualificationother.objects.filter(pk__in=array).delete()
-        return Response(status = status.HTTP_200_OK)
-    @action(methods=['get'], detail=False,url_name='qualification_group_by', perms_map = {'*':'*'})
+        return Response(status=status.HTTP_200_OK)
+
+    @action(methods=["get"], detail=False, url_name="qualification_group_by", perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
-            group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by('qualification__ssbm__sort', group_by))
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
+            group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by("qualification__ssbm__sort", group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
 
+
 class InspectionViewSet(RecordMixin, ModelViewSet):
     """
     检验能力：增删改查
     """
-    perms_map = {'get': 'inspection_view', 'post': 'inspection_create',
-                 'put': 'inspection_update', 'delete': 'inspection_delete'}
+
+    perms_map = {"get": "inspection_view", "post": "inspection_create", "put": "inspection_update", "delete": "inspection_delete"}
     queryset = Inspection.objects.all()
     serializer_class = InspectionSerializer
-    search_fields = ['dlmc', 'jydx', 'dxxh','jyxmmc','jybz','sszx','sm']
-    ordering_fields = ['dlmc']
-    ordering = ['create_time', 'jyxmxh']
-    filterset_fields = ['sszx']
-    @action(methods=['post'], detail=False, url_path='deletes', url_name='inspection_deletes', perms_map = {'post':'inspection_deletes'})    
+    search_fields = ["dlmc", "jydx", "dxxh", "jyxmmc", "jybz", "sszx", "sm"]
+    ordering_fields = ["dlmc"]
+    ordering = ["create_time", "jyxmxh"]
+    filterset_fields = ["sszx"]
+
+    @action(methods=["post"], detail=False, url_path="deletes", url_name="inspection_deletes", perms_map={"post": "inspection_deletes"})
     def deletes(self, request):
-        
-        array = request.data['ids']  
+        array = request.data["ids"]
         Inspection.objects.filter(pk__in=array).delete()
-       
-        return Response(status = status.HTTP_200_OK)
-    @action(methods=['get'], detail=False,url_name='inspection_group_by', perms_map = {'*':'*'})
+
+        return Response(status=status.HTTP_200_OK)
+
+    @action(methods=["get"], detail=False, url_name="inspection_group_by", perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
             group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by(group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
 
-    @action(methods=['post'], detail=False, url_path='inspection2', url_name='inspection_inspection2', perms_map = {'post':'inspection_inspection2'})
+    @action(methods=["post"], detail=False, url_path="inspection2", url_name="inspection_inspection2", perms_map={"post": "inspection_inspection2"})
     def inspection_import2(self, request, pk=None):
         """
         导入能力2
         """
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
         import os
-        if fullpath.endswith('.rar'):
+
+        if fullpath.endswith(".rar"):
             rar = rarfile.RarFile(fullpath)
-            fulldir = fullpath.replace('.rar','')
+            fulldir = fullpath.replace(".rar", "")
             os.mkdir(fulldir)
             os.chdir(fulldir)
             rar.extractall()
@@ -416,68 +434,70 @@ class InspectionViewSet(RecordMixin, ModelViewSet):
             # CMA.objects.filter(type='sub').delete()
             for root, dirs, files in os.walk(fulldir):
                 for f in files:
-                    if f.endswith('.xlsx'):
-                        import_inspection(f, os.path.join(root,f))
+                    if f.endswith(".xlsx"):
+                        import_inspection(f, os.path.join(root, f))
                     else:
-                        return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        elif fullpath.endswith('.zip'):
-            fulldir = fullpath.replace('.zip','')
+                        return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        elif fullpath.endswith(".zip"):
+            fulldir = fullpath.replace(".zip", "")
             if os.path.exists(fulldir):
-               import shutil
-               shutil.rmtree(fulldir) # 先删除该文件夹
+                import shutil
+
+                shutil.rmtree(fulldir)  # 先删除该文件夹
             os.mkdir(fulldir)
             os.chdir(fulldir)
             # CMA.objects.filter(type='sub').delete()
-            with zipfile.ZipFile(fullpath,'r') as zzz:
+            with zipfile.ZipFile(fullpath, "r") as zzz:
                 zzz.extractall(fulldir)
                 for root, dirs, files in os.walk(fulldir):
                     for f in files:
-                        if f.endswith('.xlsx'):
-                            import_inspection(f.encode('cp437').decode('gbk'), os.path.join(root,f))
+                        if f.endswith(".xlsx"):
+                            import_inspection(f.encode("cp437").decode("gbk"), os.path.join(root, f))
                         else:
-                            return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
-        return Response(status = status.HTTP_200_OK)
+                            return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+        return Response(status=status.HTTP_200_OK)
+
 
-    
 class CNASViewSet(RecordMixin, ModelViewSet):
     """
     CNAS检测能力：增删改查
     """
-    perms_map = {'get': 'cma_view', 'post': 'cnas_create',
-                 'put': 'cnas_update', 'delete': 'cnas_delete'}
+
+    perms_map = {"get": "cma_view", "post": "cnas_create", "put": "cnas_update", "delete": "cnas_delete"}
     queryset = CNAS.objects.all()
     serializer_class = CNASSerializer
-    search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'bztk']
-    ordering_fields = ['bzmc']
-    filterset_fields = ['sszx']
-    ordering = ['create_time']
+    search_fields = ["bzbh", "bzmc", "sszx", "xmmc", "bztk"]
+    ordering_fields = ["bzmc"]
+    filterset_fields = ["sszx"]
+    ordering = ["create_time"]
 
-    @action(methods=['get'], detail=False,url_name='cnas_group_by', perms_map = {'*':'*'})
+    @action(methods=["get"], detail=False, url_name="cnas_group_by", perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
             group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by(group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
-        
-    @action(methods=['post'], detail=False, url_path='import', url_name='cnas_import', perms_map = {'post':'cnas_import'})
+
+    @action(methods=["post"], detail=False, url_path="import", url_name="cnas_import", perms_map={"post": "cnas_import"})
     def cnas_import(self, request, pk=None):
         """
         导入能力
         """
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
         import os
-        if fullpath.endswith('.rar'):
+
+        if fullpath.endswith(".rar"):
             rar = rarfile.RarFile(fullpath)
-            fulldir = fullpath.replace('.rar','')
+            fulldir = fullpath.replace(".rar", "")
             os.mkdir(fulldir)
             os.chdir(fulldir)
             rar.extractall()
@@ -485,73 +505,75 @@ class CNASViewSet(RecordMixin, ModelViewSet):
             CNAS.objects.all().delete()
             for root, dirs, files in os.walk(fulldir):
                 for f in files:
-                    if f.endswith('.xls'):
-                        return Response('不支持旧xls格式', status = status.HTTP_400_BAD_REQUEST)
-                    import_cnas(f, os.path.join(root,f))
-        elif fullpath.endswith('.zip'):
-            fulldir = fullpath.replace('.zip','')
+                    if f.endswith(".xls"):
+                        return Response("不支持旧xls格式", status=status.HTTP_400_BAD_REQUEST)
+                    import_cnas(f, os.path.join(root, f))
+        elif fullpath.endswith(".zip"):
+            fulldir = fullpath.replace(".zip", "")
             if os.path.exists(fulldir):
-               import shutil
-               shutil.rmtree(fulldir) # 先删除该文件夹
+                import shutil
+
+                shutil.rmtree(fulldir)  # 先删除该文件夹
             os.mkdir(fulldir)
             os.chdir(fulldir)
             CNAS.objects.all().delete()
-            with zipfile.ZipFile(fullpath,'r') as zzz:
+            with zipfile.ZipFile(fullpath, "r") as zzz:
                 zzz.extractall(fulldir)
                 for root, dirs, files in os.walk(fulldir):
                     for f in files:
-                        import_cnas(f.encode('cp437').decode('gbk'), os.path.join(root,f))
-        return Response(status = status.HTTP_200_OK)
+                        import_cnas(f.encode("cp437").decode("gbk"), os.path.join(root, f))
+        return Response(status=status.HTTP_200_OK)
 
 
 class CorrectViewSet(RecordMixin, ModelViewSet):
     """
     校验能力：增删改查
     """
-    perms_map = {'get': 'correct_view', 'post': 'correct_create',
-                 'put': 'correct_update', 'delete': 'correct_delete'}
+
+    perms_map = {"get": "correct_view", "post": "correct_create", "put": "correct_update", "delete": "correct_delete"}
     queryset = Correct.objects.all()
     serializer_class = CorrectSerializer
-    search_fields = ['dlmc', 'lbmc', 'bclmc','jzgc']
-    ordering_fields = ['dlmc']
-    ordering = ['create_time', 'dlmc']
-    filterset_fields = ['ssbm', 'ssgs']
+    search_fields = ["dlmc", "lbmc", "bclmc", "jzgc"]
+    ordering_fields = ["dlmc"]
+    ordering = ["create_time", "dlmc"]
+    filterset_fields = ["ssbm", "ssgs"]
 
-    @action(methods=['post'], detail=False, perms_map = {'post':'correct_delete'})    
+    @action(methods=["post"], detail=False, perms_map={"post": "correct_delete"})
     def deletes(self, request):
-        array = request.data['ids']  
+        array = request.data["ids"]
         Correct.objects.filter(pk__in=array).delete()
-        return Response(status = status.HTTP_200_OK)
+        return Response(status=status.HTTP_200_OK)
 
-    @action(methods=['get'], detail=False, perms_map = {'*':'*'})
+    @action(methods=["get"], detail=False, perms_map={"*": "*"})
     def group(self, request, pk=None):
         """
         聚合查询列
         """
         queryset = self.filter_queryset(self.get_queryset())
         ret = []
-        if request.query_params.get('group_by', None):
-            group_by = request.query_params.get('group_by')
+        if request.query_params.get("group_by", None):
+            group_by = request.query_params.get("group_by")
             group_by_data = list(queryset.values(group_by).annotate(count=Count(group_by)).order_by(group_by))
             for i in group_by_data:
-                if i[group_by] and i['count']:
-                    ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
+                if i[group_by] and i["count"]:
+                    ret.append({"text": i[group_by] + "(" + str(i["count"]) + ")", "value": i[group_by]})
         return Response(ret)
 
-    @action(methods=['post'], detail=False, url_path="import")
+    @action(methods=["post"], detail=False, url_path="import")
     def correct_import(self, request, pk=None):
         """
         导入校验能力
         """
-        filepath = request.data['path']
+        filepath = request.data["path"]
         fullpath = settings.BASE_DIR + filepath
-        if fullpath.endswith('.xlsx'):
+        if fullpath.endswith(".xlsx"):
             ret = import_correct(fullpath)
             if ret[0]:
                 return Response()
             return Response(ret[1], status=status.HTTP_400_BAD_REQUEST)
         else:
-            return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
+            return Response("不支持非xlsx格式", status=status.HTTP_400_BAD_REQUEST)
+
 
 def import_qualification(path):
     wb = load_workbook(path)
@@ -561,16 +583,16 @@ def import_qualification(path):
     obj = {}
     Qualificationother.objects.all().delete()
     Qualification.objects.all().delete()
-    while i<max_row+1:
-        sszx = sheet['b'+str(i)].value
-        cma = sheet['c'+str(i)].value
-        cnas = sheet['d'+str(i)].value
-        service = sheet['g'+str(i)].value
-        name = sheet['e'+str(i)].value
-        description = sheet['f'+str(i)].value
+    while i < max_row + 1:
+        sszx = sheet["b" + str(i)].value
+        cma = sheet["c" + str(i)].value
+        cnas = sheet["d" + str(i)].value
+        service = sheet["g" + str(i)].value
+        name = sheet["e" + str(i)].value
+        description = sheet["f" + str(i)].value
         if sszx:
             if Organization.objects.filter(name=sszx).exists():
-                ssbm=Organization.objects.get(name=sszx)
+                ssbm = Organization.objects.get(name=sszx)
                 if Qualification.objects.filter(ssbm=ssbm).exists():
                     qualification = Qualification.objects.get(ssbm=ssbm)
                     Qualificationother.objects.create(qualification=qualification, name=name, description=description)
@@ -592,34 +614,37 @@ def import_cma(filename, path):
     wb = load_workbook(path)
     sheet = wb.worksheets[0]
     datalist = []
-    sszx = filename.replace('.xlsx','').replace('14检验检测能力申请表-','')
+    sszx = filename.replace(".xlsx", "").replace("14检验检测能力申请表-", "")
     i = 4
-    while sheet['b'+str(i)].value:
+    while sheet["b" + str(i)].value:
         data = {}
-        data['dlxh'] = sheet['a'+str(i)].value
-        data['dlmc'] = sheet['b'+str(i)].value
-        data['lbxh'] = sheet['c'+str(i)].value
-        data['lbmc'] = sheet['d'+str(i)].value
-        data['xmxh'] = sheet['e'+str(i)].value
-        data['xmmc'] = sheet['f'+str(i)].value
-        data['bzmc'] = sheet['g'+str(i)].value
-        data['bzbh'] = sheet['h'+str(i)].value
-        data['xzfw'] = sheet['i'+str(i)].value
-        data['bz'] = sheet['j'+str(i)].value
-        data['sszx'] = sszx
-        data['type'] = 'center'
+        data["dlxh"] = sheet["a" + str(i)].value
+        data["dlmc"] = sheet["b" + str(i)].value
+        data["lbxh"] = sheet["c" + str(i)].value
+        data["lbmc"] = sheet["d" + str(i)].value
+        data["xmxh"] = sheet["e" + str(i)].value
+        data["xmmc"] = sheet["f" + str(i)].value
+        data["bzmc"] = sheet["g" + str(i)].value
+        data["bzbh"] = sheet["h" + str(i)].value
+        data["xzfw"] = sheet["i" + str(i)].value
+        data["bz"] = sheet["j" + str(i)].value
+        data["sszx"] = sszx
+        data["type"] = "center"
         datalist.append(CMA(**data))
         i = i + 1
     CMA.objects.bulk_create(datalist)
 
+
 import xlrd
+
+
 def import_cnas(filename, path):
-    sheet = xlrd.open_workbook(path).sheet_by_name('检测能力范围')
+    sheet = xlrd.open_workbook(path).sheet_by_name("检测能力范围")
     datalist = []
-    sszx = filename.replace('.xlsx','').replace('.xls', '').replace('检测能力范围(含能源之星)-','')
+    sszx = filename.replace(".xlsx", "").replace(".xls", "").replace("检测能力范围(含能源之星)-", "")
     i = 2
-    lbmc = ''
-    xmmc = ''
+    lbmc = ""
+    xmmc = ""
     while i < sheet.nrows:
         data = {}
         data_list = sheet.row_values(i)
@@ -627,242 +652,250 @@ def import_cnas(filename, path):
             lbmc = data_list[1]
         if data_list[6]:
             xmmc = data_list[6]
-        data['lbmc'] = lbmc
-        data['xmmc'] = xmmc
-        data['bzmc'] = data_list[11]
-        data['bzbh'] = data_list[13]
-        data['bztk'] = data_list[15]
-        data['sszx'] = sszx
+        data["lbmc"] = lbmc
+        data["xmmc"] = xmmc
+        data["bzmc"] = data_list[11]
+        data["bzbh"] = data_list[13]
+        data["bztk"] = data_list[15]
+        data["sszx"] = sszx
+        data["sm"] = data_list[17]
         datalist.append(CNAS(**data))
         i = i + 1
     CNAS.objects.bulk_create(datalist)
 
+
 def import_cma2(filename, path):
-    wb = load_workbook(path,data_only=True)
+    wb = load_workbook(path, data_only=True)
     sheet = wb.worksheets[0]
     datalist = []
-    sszx = filename.split('-')[0]
+    sszx = filename.split("-")[0]
     # if CMA.objects.filter(sszx=sszx, type='sub').exists():
     #     CMA.objects.filter(sszx=sszx, type='sub').delete()
     i = 3
     max_row = sheet.max_row
     defaultv = {}
-    while i<max_row+1:
+    while i < max_row + 1:
         data = {}
-        if sheet['a'+str(i)].value:
-            data['dlxh'] = sheet['a'+str(i)].value
-            defaultv['dlxh'] = data['dlxh']
+        if sheet["a" + str(i)].value:
+            data["dlxh"] = sheet["a" + str(i)].value
+            defaultv["dlxh"] = data["dlxh"]
         else:
-            data['dlxh'] = defaultv['dlxh']
-        if sheet['b'+str(i)].value:
-            data['dlmc'] = sheet['b'+str(i)].value
-            defaultv['dlmc'] = data['dlmc']
+            data["dlxh"] = defaultv["dlxh"]
+        if sheet["b" + str(i)].value:
+            data["dlmc"] = sheet["b" + str(i)].value
+            defaultv["dlmc"] = data["dlmc"]
         else:
-            data['dlmc'] = defaultv['dlmc']
-        if sheet['c'+str(i)].value:
-            data['lbxh'] = sheet['c'+str(i)].value
-            defaultv['lbxh'] = data['lbxh']
+            data["dlmc"] = defaultv["dlmc"]
+        if sheet["c" + str(i)].value:
+            data["lbxh"] = sheet["c" + str(i)].value
+            defaultv["lbxh"] = data["lbxh"]
         else:
-            data['lbxh'] = defaultv.get('lbxh', '')
-        if sheet['d'+str(i)].value:
-            data['lbmc'] = sheet['d'+str(i)].value
-            defaultv['lbmc'] = data['lbmc']
+            data["lbxh"] = defaultv.get("lbxh", "")
+        if sheet["d" + str(i)].value:
+            data["lbmc"] = sheet["d" + str(i)].value
+            defaultv["lbmc"] = data["lbmc"]
         else:
-            data['lbmc'] = defaultv['lbmc']
-        if sheet['e'+str(i)].value:
-            data['xmxh'] = sheet['e'+str(i)].value
-            defaultv['xmxh'] = data['xmxh']
+            data["lbmc"] = defaultv["lbmc"]
+        if sheet["e" + str(i)].value:
+            data["xmxh"] = sheet["e" + str(i)].value
+            defaultv["xmxh"] = data["xmxh"]
         else:
-            data['xmxh'] = defaultv.get('xmxh', '')
-        if sheet['f'+str(i)].value:
-            data['xmmc'] = sheet['f'+str(i)].value
-            defaultv['xmmc'] = data['xmmc']
+            data["xmxh"] = defaultv.get("xmxh", "")
+        if sheet["f" + str(i)].value:
+            data["xmmc"] = sheet["f" + str(i)].value
+            defaultv["xmmc"] = data["xmmc"]
         else:
-            data['xmmc'] = defaultv['xmmc']
-        if sheet['g'+str(i)].value:
-            data['bzmc'] = sheet['g'+str(i)].value
-            defaultv['bzmc'] = data['bzmc']
+            data["xmmc"] = defaultv["xmmc"]
+        if sheet["g" + str(i)].value:
+            data["bzmc"] = sheet["g" + str(i)].value
+            defaultv["bzmc"] = data["bzmc"]
         else:
-            data['bzmc'] = defaultv['bzmc']
-        if sheet['h'+str(i)].value:
-            data['bzbh'] = sheet['h'+str(i)].value
-            defaultv['bzbh'] = data['bzbh']
+            data["bzmc"] = defaultv["bzmc"]
+        if sheet["h" + str(i)].value:
+            data["bzbh"] = sheet["h" + str(i)].value
+            defaultv["bzbh"] = data["bzbh"]
         else:
-            data['bzbh'] = defaultv['bzbh']
-        data['xzfw'] = sheet['i'+str(i)].value if (sheet['i'+str(i)].value and sheet['i'+str(i)].value !='无') else None
-        data['bz'] = sheet['j'+str(i)].value if (sheet['j'+str(i)].value and sheet['j'+str(i)].value !='无') else None
-        data['glzz'] = sheet['k'+str(i)].value if (sheet['k'+str(i)].value and sheet['k'+str(i)].value !='无') else None
-        data['sszx'] = sszx
-        data['type'] = 'sub'
+            data["bzbh"] = defaultv["bzbh"]
+        data["xzfw"] = sheet["i" + str(i)].value if (sheet["i" + str(i)].value and sheet["i" + str(i)].value != "无") else None
+        data["bz"] = sheet["j" + str(i)].value if (sheet["j" + str(i)].value and sheet["j" + str(i)].value != "无") else None
+        data["glzz"] = sheet["k" + str(i)].value if (sheet["k" + str(i)].value and sheet["k" + str(i)].value != "无") else None
+        data["sszx"] = sszx
+        data["type"] = "sub"
         datalist.append(CMA(**data))
         i = i + 1
     CMA.objects.bulk_create(datalist)
+
+
 def import_inspection(filename, path):
-    wb = load_workbook(path,data_only=True)
+    wb = load_workbook(path, data_only=True)
     sheet = wb.worksheets[0]
     datalist = []
-    sszx = filename.split('-')[0]
+    sszx = filename.split("-")[0]
     if Inspection.objects.filter(sszx=sszx).exists():
         Inspection.objects.filter(sszx=sszx).delete()
     i = 3
     max_row = sheet.max_row
     defaultv = {}
-    while i<max_row+1:
+    while i < max_row + 1:
         data = {}
-        if sheet['a'+str(i)].value:
-            data['dlxh'] = sheet['a'+str(i)].value
-            defaultv['dlxh'] = data['dlxh']
+        if sheet["a" + str(i)].value:
+            data["dlxh"] = sheet["a" + str(i)].value
+            defaultv["dlxh"] = data["dlxh"]
         else:
-            data['dlxh'] = defaultv['dlxh']
-           
-        if sheet['b'+str(i)].value:
-            data['dlmc'] = sheet['b'+str(i)].value
-            defaultv['dlmc'] = data['dlmc']
+            data["dlxh"] = defaultv["dlxh"]
+
+        if sheet["b" + str(i)].value:
+            data["dlmc"] = sheet["b" + str(i)].value
+            defaultv["dlmc"] = data["dlmc"]
         else:
-            data['dlmc'] = defaultv['dlmc']
-        if sheet['c'+str(i)].value:
-            data['dxxh'] = sheet['c'+str(i)].value
-            defaultv['dxxh'] = data['dxxh']
+            data["dlmc"] = defaultv["dlmc"]
+        if sheet["c" + str(i)].value:
+            data["dxxh"] = sheet["c" + str(i)].value
+            defaultv["dxxh"] = data["dxxh"]
         else:
-            data['dxxh'] = defaultv['dxxh']
-        if sheet['d'+str(i)].value:
-            data['jydx'] = sheet['d'+str(i)].value
-            defaultv['jydx'] = data['jydx']
+            data["dxxh"] = defaultv["dxxh"]
+        if sheet["d" + str(i)].value:
+            data["jydx"] = sheet["d" + str(i)].value
+            defaultv["jydx"] = data["jydx"]
         else:
-            data['jydx'] = defaultv['jydx']
-        if sheet['e'+str(i)].value:
-            data['jyxmxh'] = sheet['e'+str(i)].value
-            
-        elif sheet['e3'].value: # 该表存在项目序号
+            data["jydx"] = defaultv["jydx"]
+        if sheet["e" + str(i)].value:
+            data["jyxmxh"] = sheet["e" + str(i)].value
+
+        elif sheet["e3"].value:  # 该表存在项目序号
             m = i - 1
             while True:
-                if sheet['e'+str(m)].value:
-                    data['jyxmxh'] = sheet['e'+str(m)].value
+                if sheet["e" + str(m)].value:
+                    data["jyxmxh"] = sheet["e" + str(m)].value
                     break
                 m = m - 1
-        else: #该表没有项目序号，自己定
+        else:  # 该表没有项目序号，自己定
             pass
-        if sheet['f'+str(i)].value:
-            data['jyxmmc'] = sheet['f'+str(i)].value
+        if sheet["f" + str(i)].value:
+            data["jyxmmc"] = sheet["f" + str(i)].value
         else:
             m = i - 1
             while True:
-                if sheet['f'+str(m)].value:
-                    data['jyxmmc'] = sheet['f'+str(m)].value
+                if sheet["f" + str(m)].value:
+                    data["jyxmmc"] = sheet["f" + str(m)].value
                     break
                 m = m - 1
-        if sheet['g'+str(i)].value:
-            data['jybz'] = sheet['g'+str(i)].value
-        elif sheet['g3'].value:
+        if sheet["g" + str(i)].value:
+            data["jybz"] = sheet["g" + str(i)].value
+        elif sheet["g3"].value:
             m = i - 1
             while True:
-                if sheet['g'+str(m)].value:
-                    data['jybz'] = sheet['g'+str(m)].value
+                if sheet["g" + str(m)].value:
+                    data["jybz"] = sheet["g" + str(m)].value
                     break
                 m = m - 1
-        if sheet['h'+str(i)].value:
-            data['sm'] = sheet['h'+str(i)].value
-        elif sheet['h3'].value:
+        if sheet["h" + str(i)].value:
+            data["sm"] = sheet["h" + str(i)].value
+        elif sheet["h3"].value:
             m = i - 1
             while True:
-                if sheet['h'+str(m)].value:
-                    data['sm'] = sheet['h'+str(m)].value
+                if sheet["h" + str(m)].value:
+                    data["sm"] = sheet["h" + str(m)].value
                     break
                 m = m - 1
-        if sheet['i'+str(i)].value:
-            data['sxrq'] = sheet['i'+str(i)].value
-        elif sheet['i3'].value:
+        if sheet["i" + str(i)].value:
+            data["sxrq"] = sheet["i" + str(i)].value
+        elif sheet["i3"].value:
             m = i - 1
             while True:
-                if sheet['i'+str(m)].value:
-                    data['sxrq'] = sheet['i'+str(m)].value
+                if sheet["i" + str(m)].value:
+                    data["sxrq"] = sheet["i" + str(m)].value
                     break
                 m = m - 1
-       
-        data['sszx'] = sszx
+
+        data["sszx"] = sszx
         datalist.append(Inspection(**data))
         i = i + 1
     Inspection.objects.bulk_create(datalist)
 
+
 def import_correct(path):
-    wb = load_workbook(path,data_only=True)
+    wb = load_workbook(path, data_only=True)
     sheet = wb.worksheets[0]
     datalist = []
-    ssgs = sheet['k3'].value
+    ssgs = sheet["k3"].value
     try:
         ssbm = Organization.objects.get(name=ssgs)
     except:
-        return False , ssgs+'不存在'
+        return False, ssgs + "不存在"
     if Correct.objects.filter(ssbm=ssbm).exists():
         Correct.objects.filter(ssbm=ssbm).delete()
     i = 3
     max_row = sheet.max_row
     defaultv = {}
-    while i<max_row+1:
+    while i < max_row + 1:
         data = {}
-        if sheet['a'+str(i)].value:
-            data['dlxh'] = sheet['a'+str(i)].value
-            defaultv['dlxh'] = data['dlxh']
+        if sheet["a" + str(i)].value:
+            data["dlxh"] = sheet["a" + str(i)].value
+            defaultv["dlxh"] = data["dlxh"]
         else:
-            data['dlxh'] = defaultv['dlxh']
-        if sheet['b'+str(i)].value:
-            data['dlmc'] = sheet['b'+str(i)].value
-            defaultv['dlmc'] = data['dlmc']
+            data["dlxh"] = defaultv["dlxh"]
+        if sheet["b" + str(i)].value:
+            data["dlmc"] = sheet["b" + str(i)].value
+            defaultv["dlmc"] = data["dlmc"]
         else:
-            data['dlmc'] = defaultv['dlmc']
-        if sheet['c'+str(i)].value:
-            data['lbxh'] = sheet['c'+str(i)].value
-            defaultv['lbxh'] = data['lbxh']
+            data["dlmc"] = defaultv["dlmc"]
+        if sheet["c" + str(i)].value:
+            data["lbxh"] = sheet["c" + str(i)].value
+            defaultv["lbxh"] = data["lbxh"]
         else:
-            data['lbxh'] = defaultv['lbxh']
-        if sheet['d'+str(i)].value:
-            data['lbmc'] = sheet['d'+str(i)].value
-            defaultv['lbmc'] = data['lbmc']
+            data["lbxh"] = defaultv["lbxh"]
+        if sheet["d" + str(i)].value:
+            data["lbmc"] = sheet["d" + str(i)].value
+            defaultv["lbmc"] = data["lbmc"]
         else:
-            data['lbmc'] = defaultv['lbmc']
-        if sheet['e'+str(i)].value:
-            data['bclxh'] = sheet['e'+str(i)].value
-            defaultv['bclxh'] = data['bclxh'] 
+            data["lbmc"] = defaultv["lbmc"]
+        if sheet["e" + str(i)].value:
+            data["bclxh"] = sheet["e" + str(i)].value
+            defaultv["bclxh"] = data["bclxh"]
         else:
-            data['bclxh'] = defaultv['bclxh'] if 'bclxh' in defaultv else None
-        if sheet['f'+str(i)].value:
-            data['bclmc'] = sheet['f'+str(i)].value
-            defaultv['bclmc'] = data['bclmc']
+            data["bclxh"] = defaultv["bclxh"] if "bclxh" in defaultv else None
+        if sheet["f" + str(i)].value:
+            data["bclmc"] = sheet["f" + str(i)].value
+            defaultv["bclmc"] = data["bclmc"]
         else:
-            data['bclmc'] = defaultv['bclmc']
-        if sheet['g'+str(i)].value:
-            data['jzgc'] = sheet['g'+str(i)].value
-            defaultv['jzgc'] = data['jzgc']
+            data["bclmc"] = defaultv["bclmc"]
+        if sheet["g" + str(i)].value:
+            data["jzgc"] = sheet["g" + str(i)].value
+            defaultv["jzgc"] = data["jzgc"]
         else:
-            data['jzgc'] = defaultv['jzgc']
-        if sheet['h'+str(i)].value:
-            data['clfw'] = sheet['h'+str(i)].value
-            defaultv['clfw'] = data['clfw']
+            data["jzgc"] = defaultv["jzgc"]
+        if sheet["h" + str(i)].value:
+            data["clfw"] = sheet["h" + str(i)].value
+            defaultv["clfw"] = data["clfw"]
         else:
-            data['clfw'] = defaultv['clfw']
-        data['zqddj'] = sheet['i'+str(i)].value if (sheet['i'+str(i)].value and sheet['i'+str(i)].value !='无') else None
-        data['note'] = sheet['j'+str(i)].value if (sheet['j'+str(i)].value and sheet['j'+str(i)].value !='无') else None
-        data['ssgs'] = ssgs
-        data['ssbm'] = ssbm
+            data["clfw"] = defaultv["clfw"]
+        data["zqddj"] = sheet["i" + str(i)].value if (sheet["i" + str(i)].value and sheet["i" + str(i)].value != "无") else None
+        data["note"] = sheet["j" + str(i)].value if (sheet["j" + str(i)].value and sheet["j" + str(i)].value != "无") else None
+        data["ssgs"] = ssgs
+        data["ssbm"] = ssbm
         datalist.append(Correct(**data))
         i = i + 1
     Correct.objects.bulk_create(datalist)
-    return True, ''
+    return True, ""
+
 
 from django.db.models.functions import Cast
+
+
 def merge_cnas(request):
     for i in CNAS.objects.all():
-        objs = Ability.objects.filter(lbmc=i.lbmc,xmmc=i.xmmc, bzbh=i.bzbh, bztk=i.bztk, bzmc=i.bzmc)
+        objs = Ability.objects.filter(lbmc=i.lbmc, xmmc=i.xmmc, bzbh=i.bzbh, bztk=i.bztk, bzmc=i.bzmc)
         if objs.exists():
             obj = objs[0]
             obj.cnas_ok = True
             if obj.cnas:
-                obj.cnas = obj.cnas + ',' + i.sszx
+                obj.cnas = obj.cnas + "," + i.sszx
                 obj.save()
             else:
                 obj.cnas = i.sszx
                 obj.save()
-            print('已修改--'+obj.xmmc+ '-' + obj.cnas)
+            print("已修改--" + obj.xmmc + "-" + obj.cnas)
         else:
             obj = Ability()
             obj.lbmc = i.lbmc
@@ -873,24 +906,24 @@ def merge_cnas(request):
             obj.cnas = i.sszx
             obj.cnas_ok = True
             obj.save()
-            print('已添加--'+obj.xmmc+obj.bzmc)
+            print("已添加--" + obj.xmmc + obj.bzmc)
     return Response({})
 
 
 def merge_cma(request):
-    for i in CMA.objects.filter(type='center'):
-        bztk = i.bzbh.split(' ')[-1]
+    for i in CMA.objects.filter(type="center"):
+        bztk = i.bzbh.split(" ")[-1]
         bzbh = i.bzbh.rstrip(bztk).strip()
         xmxh = i.xmxh.strip()
-        if len(bzbh)<8:
+        if len(bzbh) < 8:
             bzbh = i.bzbh
-            bztk = ''
-        objs = Ability.objects.filter(lbmc=i.lbmc, xmmc=i.xmmc, bzbh = bzbh, bztk=bztk, xmxh=xmxh, bzmc = i.bzmc)
+            bztk = ""
+        objs = Ability.objects.filter(lbmc=i.lbmc, xmmc=i.xmmc, bzbh=bzbh, bztk=bztk, xmxh=xmxh, bzmc=i.bzmc)
         if objs.exists():
             obj = objs[0]
-            obj.cma = obj.cma + ',' + i.sszx
+            obj.cma = obj.cma + "," + i.sszx
             obj.save()
-            print('已修改--'+obj.xmmc+ '-' + obj.cma)
+            print("已修改--" + obj.xmmc + "-" + obj.cma)
         else:
             obj = Ability()
             obj.dlxh = i.dlxh
@@ -907,45 +940,38 @@ def merge_cma(request):
             obj.cma = i.sszx
             obj.cma_ok = True
             obj.save()
-            print('已添加--'+obj.xmmc+obj.bzmc)
+            print("已添加--" + obj.xmmc + obj.bzmc)
     return Response({})
+
+
 def correct_ability(request):
-    zxdict = {
-    "测试中心":"B",
-    "玻璃中心":"E",
-    "腐蚀中心":"P",
-    "光伏中心":"L",
-    "耐火中心":"Q",
-    "石材中心":"R",
-    "水泥中心":"D",
-    "质检中心":"C"
-    }
+    zxdict = {"测试中心": "B", "玻璃中心": "E", "腐蚀中心": "P", "光伏中心": "L", "耐火中心": "Q", "石材中心": "R", "水泥中心": "D", "质检中心": "C"}
     placedict = {
-    "玻璃中心-管庄": "E", 
-    "玻璃中心-密云": "E", 
-    "玻璃中心-永顺": "E", 
-    "测试中心-管庄": "B", 
-    "测试中心-光华路": "B", 
-    "测试中心-国检三层": "B", 
-    "测试中心-密云": "B", 
-    "测试中心-顺义种植园": "B", 
-    "测试中心-宋庄": "B", 
-    "测试中心-通州种植园": "B", 
-    "测试中心-永顺": "B", 
-    "腐蚀中心": "P", 
-    "光伏中心-管庄": "L", 
-    "光伏中心-密云": "L", 
-    "耐火中心": "Q", 
-    "石材中心": "R", 
-    "水泥中心": "D", 
-    "质检中心-管庄": "C", 
-    "质检中心-光华路": "C", 
-    "质检中心-国检三层": "c", 
-    "质检中心-密云": "C", 
-    "质检中心-顺义种植园": "C", 
-    "质检中心-宋庄": "C", 
-    "质检中心-通州种植园": "C", 
-    "质检中心-永顺": "C"
+        "玻璃中心-管庄": "E",
+        "玻璃中心-密云": "E",
+        "玻璃中心-永顺": "E",
+        "测试中心-管庄": "B",
+        "测试中心-光华路": "B",
+        "测试中心-国检三层": "B",
+        "测试中心-密云": "B",
+        "测试中心-顺义种植园": "B",
+        "测试中心-宋庄": "B",
+        "测试中心-通州种植园": "B",
+        "测试中心-永顺": "B",
+        "腐蚀中心": "P",
+        "光伏中心-管庄": "L",
+        "光伏中心-密云": "L",
+        "耐火中心": "Q",
+        "石材中心": "R",
+        "水泥中心": "D",
+        "质检中心-管庄": "C",
+        "质检中心-光华路": "C",
+        "质检中心-国检三层": "c",
+        "质检中心-密云": "C",
+        "质检中心-顺义种植园": "C",
+        "质检中心-宋庄": "C",
+        "质检中心-通州种植园": "C",
+        "质检中心-永顺": "C",
     }
 
     for i in Ability.objects.all():
@@ -959,11 +985,11 @@ def correct_ability(request):
             if key in i.cma_o:
                 i.cma_oplace = i.cma_oplace.replace(key, placedict[key])
         i.save()
-        print('已修改' + i.cma)
+        print("已修改" + i.cma)
 
 
 def correct_cma(request):
     for i in CMA.objects.all():
-        i.sszx = i.sszx.replace('14检验检测能力申请表-','')
+        i.sszx = i.sszx.replace("14检验检测能力申请表-", "")
         i.save()
-    return Response()
\ No newline at end of file
+    return Response()