Merge remote-tracking branch 'origin/develop' into develop

src/api/unqualProcess.js

@@ -54,3 +54,12 @@ export function meetingByMonth (params) {
     params
   })
 }
+
+export function addUn (params) {
+  return axios({
+    url: 'api/sarStandUnqualified/sar-stand-unqualified/add',
+    method: 'post',
+    params,
+    content: 'json'
+  })
+}

src/pages/localTool/standardRecognition/index.vue

@@ -65,22 +65,22 @@
             align="center"
           >
           </el-table-column>
-          <el-table-column :label="this.$t('m.textState')" width="150" align="center">
+          <el-table-column :label="this.$t('m.textState')" width="150" align="center" prop="fileType">
-            <template slot-scope="scope">
+<!--            <template slot-scope="scope">-->
-              {{
+<!--              {{-->
-                scope.row.fileType === "STAND_FILE"
+<!--                scope.row.fileType === "STAND_FILE"-->
-                  ? "标准文本"
+<!--                  ? "标准文本"-->
-                  : scope.row.fileType === "DRAFT_FILE"
+<!--                  : scope.row.fileType === "DRAFT_FILE"-->
-                  ? "草案"
+<!--                  ? "草案"-->
-                  : scope.row.fileType === "OPINION_FILE"
+<!--                  : scope.row.fileType === "OPINION_FILE"-->
-                  ? "征求意见稿"
+<!--                  ? "征求意见稿"-->
-                  : scope.row.fileType === "SENT_SCREEN_FILE"
+<!--                  : scope.row.fileType === "SENT_SCREEN_FILE"-->
-                  ? "送审稿"
+<!--                  ? "送审稿"-->
-                  : scope.row.fileType === "APPROVAL_FILE"
+<!--                  : scope.row.fileType === "APPROVAL_FILE"-->
-                  ? "报批稿"
+<!--                  ? "报批稿"-->
-                  : "关联文件"
+<!--                  : "关联文件"-->
-              }}
+<!--              }}-->
-            </template>
+<!--            </template>-->
           </el-table-column>
           <el-table-column
             prop="resultContent"
@@ -203,9 +203,9 @@
           <el-select class="bead-input" v-model="uploadFilesdfEo.fileType">
             <el-option
               v-for="item in options"
-              :key="item.value"
+              :key="item.id"
-              :label="item.label"
+              :label="item.attrName"
-              :value="item.value"
+              :value="item.attrName"
             >
             </el-option>
           </el-select>
@@ -713,6 +713,7 @@
 </template>
 
 <script>
+  import axios from 'axios'
 export default {
   name: "StandardRecognition",
   components: {},
@@ -784,30 +785,30 @@ export default {
         ]
       },
       options: [
-        {
+        // {
-          value: "STAND_FILE",
+        //   value: "STAND_FILE",
-          label: "标准文本",
+        //   label: "标准文本",
-        },
+        // },
-        {
+        // {
-          value: "DRAFT_FILE",
+        //   value: "DRAFT_FILE",
-          label: "草案",
+        //   label: "草案",
-        },
+        // },
-        {
+        // {
-          value: "OPINION_FILE",
+        //   value: "OPINION_FILE",
-          label: "征求意见稿",
+        //   label: "征求意见稿",
-        },
+        // },
-        {
+        // {
-          value: "SENT_SCREEN_FILE",
+        //   value: "SENT_SCREEN_FILE",
-          label: "送审稿",
+        //   label: "送审稿",
-        },
+        // },
-        {
+        // {
-          value: "APPROVAL_FILE",
+        //   value: "APPROVAL_FILE",
-          label: "报批稿",
+        //   label: "报批稿",
-        },
+        // },
-        {
+        // {
-          value: "RELEVANCE_FILE",
+        //   value: "RELEVANCE_FILE",
-          label: "关联文件",
+        //   label: "关联文件",
-        },
+        // },
       ],
 /*      standRecoColumn: [
         {
@@ -1340,8 +1341,8 @@ export default {
       ).standName;
       // this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
       this.options.map((item) => {
-        if (item.value === JSON.parse(JSON.stringify(row)).fileType) {
+        if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
-          this.uploadFilesdfEo.fileType = item.label;
+          this.uploadFilesdfEo.fileType = item.attrName;
         }
       });
       this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
@@ -1528,6 +1529,12 @@ export default {
   computed: {},
   created() {},
   mounted() {
+    this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
+      _this: this
+    }, res => {
+      this.options = res.data
+      console.log(this.options);
+    })
     this.getTableData();
   },
   destroyed() {},

src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue

@@ -295,7 +295,6 @@ export default {
             }, e => {
             })
           } else {
-            console.log(this.formShowData.meetTime)
             meetEdit(this.formShowData).then(res => {
               if (res.ok) {
                 this.$message.success('编辑成功')

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2590,7 +2590,7 @@
                             standName: this.ocrList[0].standName,
                             attId: this.OCRDatas[0].attId,
                             fileName: this.OCRDatas[0].fileName,
-                            fileType: this.OCRDatas[0].useModel,
+                            fileType: this.setWBType(this.OCRDatas[0].standFileClassify),
                         }
                         this.$http.post(
                             "ocr/OCRRestful/addOcrRecord",
@@ -2610,7 +2610,7 @@
                     } else if (this.OCRType === '1') {
                         let splitEo = {}
                         splitEo.standId = this.OCRDatas[0].standId
-                        splitEo.fileType = this.OCRDatas[0].standFileClassify
+                        splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
                         splitEo.attId = this.OCRDatas[0].attId
                         splitEo.fileName = this.OCRDatas[0].fileName
                         this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
@@ -5320,7 +5320,6 @@
                 _this: this
             }, res => {
                 this.OCRoptions = res.data
-                console.log(res.data);
             })
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -22,34 +22,6 @@
                 {{ opt.label}}</el-option>
             </el-select>
           </el-form-item>
-<!--          <el-form-item label="责任部门" class="search-item">-->
-<!--            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
-<!--            <el-popover-->
-<!--              placement="bottom"-->
-<!--              popper-class="user-dept-popper"-->
-<!--              trigger="click"-->
-<!--              :value="false"-->
-<!--            >-->
-<!--              <el-input-->
-<!--                slot="reference"-->
-<!--                v-model="nonConformitySearch.responsibleUnitShow"-->
-<!--                placeholder="根据责任部门查找"-->
-<!--                readonly-->
-<!--                clearable-->
-<!--                id="searchResp"-->
-<!--              />-->
-<!--              <div class="api">-->
-<!--                <laws-tree-->
-<!--                  :zNodes="zNodesSItem"-->
-<!--                  treeDivId="zNodesSItemSearch"-->
-<!--                  deptSelect-->
-<!--                  showRMenu-->
-<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
-<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
-<!--                </laws-tree>-->
-<!--              </div>-->
-<!--            </el-popover>-->
-<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -73,6 +45,13 @@
       </div>
     </div>
     <div class="content-center">
+      <el-button
+        class="common-button-primary"
+        size="small"
+        type="primary"
+        v-btn-permission="''"
+        @click="addModel"
+      ><i class="el-icon-plus"></i>新增</el-button>
       <el-button
         class="common-button-primary"
         type="primary"
@@ -209,6 +188,7 @@
                     <el-dropdown-menu slot="dropdown">
                       <!--未符合项整改库-查看-->
                       <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">编辑</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -218,7 +198,7 @@
         </div>
       </div>
       <div class="footer">
-        <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination :total="totalNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"
@@ -408,11 +388,348 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
     </el-dialog>
+    <!-- 选择项目抽屉-->
+    <el-drawer
+      title="选择项目"
+      :visible.sync="projectModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="项目编号" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.projectNumber"
+                    placeholder="请输入项目编号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="项目名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.projectName"
+                    placeholder="请输入项目名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="''"
+                    @click="getProjectDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="''"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+              <el-table
+                :data="ProjectDatas"
+                tooltip-effect="dark"
+                style="width: 100%;"
+                border
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                @selection-change="selectListChange"
+                @select="handleSelectionChanges"
+                ref="listSelection"
+              >
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center" />
+                <el-table-column
+                  prop="projectNumber"
+                  align="center"
+                  label="项目编号"
+                />
+                <el-table-column
+                  prop="projectName"
+                  align="center"
+                  label="项目名称"
+                />
+                <el-table-column
+                  prop="projectClassification"
+                  align="center"
+                  label="项目分类"
+                />
+                <el-table-column
+                  prop="uname"
+                  align="center"
+                  label="项目经理"
+                />
+              </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+    <!-- 选择项目下标准抽屉-->
+    <el-drawer
+      title="选择标准"
+      :visible.sync="listModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <el-table
+              :data="dataList"
+              border
+              ref="selection"
+              height="100%"
+              style="width: 100%; border:1px solid #ccc"
+              @selection-change="selectStandChange"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="标准号"
+              >
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                    }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                align="center"
+                label="中文名称"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="ssrq"
+                align="center"
+                sortable
+                label="标准实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="zrbm"
+                label="责任部门"
+                align="center"
+              >
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="standPage"
+            :pageSize="standPageSize"
+            :total="standTotal"
+            @pageChange="standPageChange"
+            @pageSizeChange="standPageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkStand">带入</el-button>
+      </div>
+    </el-drawer>
+    <!-- 填写未符合项信息表单-->
+    <el-drawer
+      size="700px"
+      :before-close="addDrawerClose"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div class="demo-drawer-content" v-if="drawerTable">
+        <div class="content">
+          <div class="standard-table-search">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form :model="addForm"  inline class="label-input-form" :rules="formRules" label-width="180px"  ref="addForm">
+                  <el-form-item prop="standNumber" label="标准号" style="width: 100%; margin-right:10px" class="add-form-item">
+                    <el-input
+                      v-model="addForm.standNumber"
+                      placeholder="请输入标准号"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.standName"
+                      placeholder="请输入标准名称"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px" class="add-form-item add-input" >
+                    <el-input
+                      v-model="addForm.itemsNum"
+                      placeholder="请输入条款号"
+                      :maxlength="500">
+                    </el-input>
+                  </el-form-item>
+<!--                  <el-button-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="mini"-->
+<!--                    @click="handSeek"-->
+<!--                    style="position:absolute;top: 10px; float: right;"-->
+<!--                  >手动查找</el-button>-->
+                  <el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.itemsName"
+                      placeholder="请输入条款名称"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="projectPlatfor" label="产品类型" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.projectPlatfor"
+                      placeholder="请输入产品类型"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.productLine"
+                      placeholder="请输入产品线"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="projectName" label="项目名称" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.projectName"
+                      placeholder="请输入项目名称"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="researchNonCompliance" label="不合规项目" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.researchNonCompliance"
+                      placeholder="请输入不合规项目"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.responsibleUnit"
+                      placeholder="请输入责任部门"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="responsibleEngineer" label="责任工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.responsibleEngineer"
+                      placeholder="请输入责任工程师"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="certifiedEngineerName" label="认证工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.certifiedEngineerName"
+                      placeholder="请输入认证工程师"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="qualityEngineerName" label="质量工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-input
+                      v-model="addForm.qualityEngineerName"
+                      placeholder="请输入质量工程师"
+                      :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px" class="add-form-item" >
+                    <el-date-picker
+                      v-model="addForm.planCloseTime"
+                      type="date"
+                      placeholder="请选择计划关闭时间"
+                      value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button
+          size="mini"
+          class="common-button-primary"
+          icon="el-icon-check"
+          type="primary"
+          @click="submit">提交
+        </el-button>
+        <el-button
+          size="mini"
+          class="common-button-default"
+          icon="el-icon-close"
+          @click="addDrawerClose">取消</el-button>
+      </div>
+    </el-drawer>
+<!--    条款弹窗-->
+    <el-dialog   title="条款信息" :append-to-body="true"  width="875px" :visible.sync="itemModel">
+      <el-table
+        ref="selections"
+        :data="itemsData"
+        tooltip-effect="dark"
+        style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+        border
+        :height="300"
+        @selection-change="selectReplaceStandNumRowChange"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+        prop="itemsNum"
+        label="条款号"
+        align="center"
+      >
+      </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          label="条款名称"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <loading :loading="replaceLoading">数据获取中</loading>
+      <!--分页-->
+      <pagination
+        style="position: relative;"
+        :page="replacePage"
+        :page-size="replacePageSize"
+        :total="replaceTotal"
+        @pageChange="pageChangeReplace"
+        @pageSizeChange="pageSizeChangeReplace"></pagination>
+      <div slot="footer" class="demo-drawer-footer">
+        <el-button class="common-button-default"  @click="itemModel = false">取消</el-button>
+        <el-button type="primary"  class="common-button-primary"  @click="replaceLawsNumModelBt">带入</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
+import { addUn } from '@/api/unqualProcess'
 
 export default {
   name: "rectificationDatabase",
@@ -420,13 +737,92 @@ export default {
     return {
       loading: false,
       nonList:[], //未符合项表格数据
+      projectModel: false, //项目弹窗
+      listModel: false, //标准弹窗
+      itemModel: false, //条款弹窗
+      replaceLoading: false,
+      //项目检索条件
+      projectSearch: {
+        projectNumber: "",
+        projectName: ""
+      },
+      //项目数据
+      ProjectDatas: [],
+      itemsData: [],
+      standList: [],
+      selectItems: [],
+      dataList: [],
+      standPage: 1,
+      standPageSize: this.$store.getters.userInfo.configContent,
+      standTotal: 0,
+      replacePage: 1,
+      replacePageSize: this.$store.getters.userInfo.configContent,
+      replaceTotal: 0,
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      drawerTitle: '',
+      breakId: '',
+      //存放被勾选的项目的数据
+      selectList: [],
+      addForm:{
+        standNumber: '', //标准号
+        standName: '', //标准名称
+        itemsNum: '', //条款号
+        itemsName: '', //条款名称
+        projectPlatfor: '', //产品类型
+        productLine: '', //产品线
+        projectName: '', //项目名称
+        researchNonCompliance: '', //不合规项目
+        responsibleUnit: '', //责任部门
+        responsibleEngineer: '', //责任工程师
+        certifiedEngineerName: '', //认证工程师
+        qualityEngineerName: '', //质量工程师
+        planCloseTime: '', //计划关闭时间
+      }, //表单数据
+      formRules: {
+        standNumber: [
+          {required: true, message: '请输入标准号', trigger: 'blur'},
+        ],
+        standName: [
+          {required: true, message: '请输入标准名称', trigger: 'blur'},
+        ],
+        itemsNum: [
+          {required: true, message: '请输入条款号', trigger: 'blur'},
+        ],
+        itemsName: [
+          {required: true, message: '请输入条款名称', trigger: 'blur'},
+        ],
+        projectPlatfor: [
+          {required: true, message: '请输入产品类型', trigger: 'blur'},
+        ],
+        productLine: [
+          {required: true, message: '请输入产品线', trigger: 'blur'},
+        ],
+        projectName: [
+          {required: true, message: '请输入项目名称', trigger: 'change'},
+        ],
+        researchNonCompliance: [
+          {required: true, message: '请输入不合规项目', trigger: 'blur'},
+        ],
+        responsibleUnit: [
+          {required: true, message: '请输入责任部门', trigger: 'blur'},
+        ],
+        responsibleEngineer: [
+          {required: true, message: '请输入责任工程师', trigger: 'blur'},
+        ],
+        planCloseTime: [
+          {required: true, message: '请选择计划关闭时间', trigger: 'blur'},
+        ],
+      },
+      drawerTable: false, //表单模态窗
       exportModelFlag: false, //导出模态窗
       tableHeight: null, //表格高度
       exportName: '',
       selectedList: [], //标准选中的数据
       saveExportType: '',// 导出文件模态框控制，和文件名称
       // 总数
-      total: 0,
+      totalNo: 0,
       // 当前页数
       pageNo: 1,
       nonConformitySearch: {
@@ -458,7 +854,7 @@ export default {
         _this: this
       }, res => {
         this.myLoading.loadData = false
-        this.total = res.data.total
+        this.totalNo = res.data.total
         this.pageNo = 1
         this.nonList = res.data.records
         this.nonList.forEach(item => {
@@ -494,7 +890,6 @@ export default {
       }
       this.exportName = ''
       this.exportModelFlag = true
-      console.log(this.saveExportType);
     },
     //取消导出
     cancal () {
@@ -504,14 +899,12 @@ export default {
     exportTestItem () {
        if(this.saveExportType === 'apart') {
          if (this.selectedList != null && this.selectedList != ''){
-           console.log(this.selectedList);
           const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
             'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
            window.open(exportURL)
            this.$message.success('导出信息成功')
          }
        } else if (this.saveExportType === 'all') {
-         console.log(this.selectedList);
          const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
            'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
          window.open(exportURL)
@@ -599,7 +992,230 @@ export default {
         case '查看':
           this.showUser(command[0])
           break
+        case '编辑':
+          this.projectEdit(command[0])
+          break
+
       }
+    },
+    //项目查询按钮
+    getProjectDataBtn(){
+      this.page = 1;
+      this.getProjectData();
+    },
+    //获取项目数据
+    getProjectData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
+        page: this.page,
+        pageSize: this.pageSize,
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.ProjectDatas = "";
+          this.total = 0;
+        } else {
+          this.ProjectDatas = res.data.Maintenance.records;
+          this.total = res.data.Maintenance.total;
+        }
+      });
+
+    },
+    //点击清空按钮事件
+    clearSearch() {
+      this.projectSearch = {
+        projectName: "",
+        projectNumber: ""
+      };
+      this.getProjectData();
+    },
+    //提交
+    submit(){
+      let jsonArr = []
+      const json = JSON.stringify(this.addForm);
+      const arr = JSON.parse(json)
+      jsonArr.push(arr)
+      // for (const item in arr) {
+      //   jsonArr.push(item +':' + arr[item])
+      // }
+      console.log(jsonArr);
+      this.$refs["addForm"].validate((valid) => {
+        if(valid){
+          addUn(jsonArr).then(res=>{
+            if(res.ok){
+              this.$message.success('新增成功')
+              this.getTableByPage()
+            }
+          })
+  /*        this.$http.postData('sarStandUnqualified/sar-stand-unqualified/add', {
+            jsonArr,
+          }, {
+            _this: this
+          }, res => {
+            if(res.ok){
+              this.$message.success('新增成功')
+              this.getTableByPage()
+            }
+          })*/
+        }else{
+          this.$message.warning('请完善基础信息')
+        }
+      })
+    },
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    }, // 关闭新增drawer
+    //带入条款确定事件
+    replaceLawsNumModelBt(){
+      if(this.selectItems.length > 1){
+        this.$message.warning('您只能选择一条数据进行带入')
+      }else if(this.selectItems.length <= 0){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.addForm.itemsName = this.selectItems[0].itemsName
+        this.addForm.itemsNum = this.selectItems[0].itemsNum
+        this.itemModel = false
+      }
+
+    },
+    //带入标准取消事件
+    closeStand(){
+      this.listModel = false;
+    },
+    //带入标准确定事件
+    OkStand(){
+      if(this.standList.length > 1){
+        this.$message.warning('您只能选择一条标准进行带入')
+      }else if(this.standList.length <= 0){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+         this.breakId = this.standList[0].standId
+        this.addForm.standName = this.standList[0].standName
+        this.addForm.standNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear || this.standList[0].standSort + '-' + this.standList[0].standNumber
+        this.addForm.responsibleUnit = this.standList[0].zrbm || '--'
+        this.drawerTitle = '新增';
+        this.drawerTable = true;
+        this.listModel = false;
+      }
+    },
+    getItem(){
+      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+        ids: this.breakId,
+        type: "FBGBJBD"
+      }, {
+        _this: this
+      }, res => {
+        this.itemsData = res.data
+        this.replaceTotal = res.data.length
+      }, e => {
+        this.$message.error("添加失败");
+      });
+    },
+    //手动查找
+    handSeek(){
+      this.itemModel = true
+      this.getItem()
+    },
+    //带入项目取消事件
+    closeDrawer() {
+      this.projectModel = false;
+    },
+    //带入项目确定事件
+    OkDrawer() {
+      if (this.selectList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else if (this.selectList.length === 0) {
+        this.$message.warning("请选择一条数据进行带入");
+      } else {
+        this.projectId = this.selectList[0].id;
+        this.addForm.productLine = this.selectList[0].productLine
+        this.addForm.projectPlatfor = this.selectList[0].projectPlatfor
+        this.addForm.projectName = this.selectList[0].projectName
+        this.getStandData();
+        this.projectModel = false;
+        this.listModel = true
+      }
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+        _this: this
+      }, res => {
+        res.data.records.forEach(item => {
+          if(item.zrbm === "[]"){
+            item.zrbm = ''
+          }
+        })
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "") {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+      });
+    },
+    //条款的多选框改变
+    selectReplaceStandNumRowChange(data){
+      this.selectItems = data
+    },
+    //标准的多选框改变
+    selectStandChange(data){
+     this.standList = data
+    },
+    //项目的多选框改变
+    selectListChange(data) {
+      this.selectList = data;
+    },
+    //单选逻辑
+    handleSelectionChanges(selection, val) {
+      if (selection.length > 1) {
+        let del_row = selection.shift();
+        this.$refs.listSelection.toggleRowSelection(del_row, false);
+      }
+    },
+    standPageChange(page){
+       this.standPage = page
+       this.getStandData()
+    },
+    standPageSizeChange(pageSize){
+      this.standPageSize = pageSize
+      this.getStandData()
+    },
+    //条款分页
+    pageChangeReplace(page){
+      this.replacePage = page
+      this.getItem()
+    },
+    pageSizeChangeReplace(pageSize){
+     this.replacePageSize = pageSize
+      this.getItem()
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getProjectData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getProjectData();
+    },
+    //新增事件
+    addModel(){
+      this.projectModel = true
+    },
+    //编辑事件
+    projectEdit(row){
+
     },
     //点击查看按钮事件
     showUser(row) {
@@ -628,7 +1244,6 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
-      console.log(item);
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
@@ -641,7 +1256,7 @@ export default {
     },
     detailsStandard (item) {
       this.$http.post('lawss/sarTestItem/validateStandNumber', {
-        standnumber: item.standNum
+        standNumber: item.standNum
       }, {
         _this: this
       }, res => {
@@ -670,17 +1285,18 @@ export default {
       })
     },
     // 分页事件
-    pageChange (page) {
+    pageChangeNo (page) {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange (pageSize) {
+    pageSizeChangeNo (pageSize) {
-      console.log(pageSize);
+      this.pageSizeNo = pageSize
       this.getTableByPage()
     },
   },
   mounted () {
-
+    //查询已维护的项目
+    this.getProjectData()
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -744,5 +1360,19 @@ export default {
       }
     }
   }
+  .add-form-item{
+    /deep/ .el-input__inner {
+      width: 300px;
+    }
+  }
+  .add-input{
+    /deep/ .el-input__inner {
+      width: 370px;
+    }
+  }
+  .tableFooter{
+    height: 49px;
+    float: right;
+  }
 }
 </style>