From af93e102fa04be3fc4c93ad247afdf86d562db45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 12 Dec 2021 15:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue |   7 +
 .../pages/rectificationDatabase.vue           | 403 ++++++++++++++----
 2 files changed, 324 insertions(+), 86 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index aea6be615..4cb725b59 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -16,6 +16,7 @@
         <el-table-column
           prop="standNumber"
           label="标准号/条款号"
+          width="160"
           align="center"
         >
         </el-table-column>
@@ -34,6 +35,7 @@
         <el-table-column
           prop="researchCompletionTime"
           label="完成时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -43,12 +45,14 @@
         <el-table-column
           prop="evaluationPeople"
           label="评估人"
+          width="160"
           align="center"
         >
         </el-table-column>
         <el-table-column
           prop="evaluationTime"
           label="评估时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -73,6 +77,7 @@
          <el-table-column
            prop="standNumber"
            label="标准号/条款号"
+           width="160"
            align="center"
          >
          </el-table-column>
@@ -85,12 +90,14 @@
          <el-table-column
            prop="evaluationPeople"
            label="评估人"
+           width="160"
            align="center"
          >
          </el-table-column>
          <el-table-column
            prop="evaluationTime"
            label="评估时间"
+           width="160"
            align="center"
          >
            <template slot-scope="scope">
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 0312294bf..e5eb602fd 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -162,7 +162,7 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineer"
+              prop="dutyEngineerName"
               width="100"
               label="责任工程师">
             </el-table-column>
@@ -415,56 +415,19 @@
               <el-col :span="24">
                 <el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
                          ref="addForm">
-                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
-                      <el-option
-                        v-for="item in ProjectDatas"
-                        :key="item.id"
-                        :label="item.projectName"
-                        :value="item"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productId"
-                      placeholder="请输入项目编号"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productType"
-                      placeholder="请输入产品类型"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productLine"
-                      placeholder="请输入产品线"
-                    />
-                  </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
-                    <el-select
+                    <el-input
                       v-model="addForm.standSerialNumber"
-                      filterable
-                      :disabled="serialNumber"
-                      @change="standChange"
-                      placeholder="请选择标准号">
-                      <el-option
-                        v-for="item in dataList"
-                        :key="item.standId"
-                        :label="item.standSort + '-' + item.standNumber + '-' + item.standYear"
-                        :value="item"
-                      ></el-option>
-                    </el-select>
+                      placeholder="请输入标准名称"
+                    />
+                    <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="showStand"
+                    >手动查找</el-button>
                   </el-form-item>
                   <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -489,6 +452,41 @@
                       placeholder="请输入条款名称"
                       :maxlength="500" />
                   </el-form-item>
+                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <!--                    <el-input-->
+                    <!--                      :disabled="true"-->
+                    <!--                      v-model="addForm.productLine"-->
+                    <!--                      placeholder="请输入产品线"-->
+                    <!--                    />-->
+                    <el-select v-model="addForm.productLine" filterable  @change="handleChangeLine" placeholder="请选择产品线">
+                      <el-option
+                        v-for="item in productLines"
+                        :key="item.id"
+                        :label="item.productLine"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
+                      <el-option
+                        v-for="item in ProjectDatas"
+                        :key="item.id"
+                        :label="item.projectName"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.productId"
+                      placeholder="请输入项目编号"
+                    />
+                  </el-form-item>
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -579,6 +577,136 @@
       :nodeList="nodeListZRBM"
       @checkedRole="drawerCheckZRBM"
     />
+    <el-dialog
+      title="添加标准"
+      :visible.sync="dialogTableVisible"
+       width="875px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <div class="search-area">
+        <div class="left">
+          <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                   style="margin-left:10px">
+            <el-form-item label="类型" class="search-item search-item-last">
+              <el-select
+                @change="typeChange"
+                v-model="standardSearch.standType"
+                placeholder="请选择"
+                filterable
+              >
+                <el-option
+                  v-for="item in standardTypeOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+              <el-input
+                v-model="standardSearch.standNumber"
+                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="'072efe80c5459dd47fedd2d14f59ff7f'"
+                @click="getStandDataBtn">
+                查询
+              </el-button>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                class="common-button-default"
+                size="small"
+                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                @click="clearStandSearch">清空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-table
+        :data="standardData"
+        tooltip-effect="dark"
+        style="width: 100%; overflow-y: auto;overflow-x: hidden;"
+        border
+        :height="300"
+        ref="table"
+        @selection-change="selectStand"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="code"
+          align="center"
+          label="标准号">
+          <template slot-scope="scope">
+            <a v-if="scope.row.standYear" class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                scope.row.standNumber
+              }}-{{ scope.row.standYear }}</a>
+            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                scope.row.standSortShow
+              }}
+              {{ scope.row.standNumber }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          align="center"
+          min-width="200"
+          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="issueTime"
+          align="center"
+          label="发布日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="ZCCSSRQ"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+      </el-table>
+      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+      <!--分页-->
+      <pagination
+        style="position: relative;"
+        :page="page"
+        :pageSize="pageSize"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
+      <div slot="footer"  class="demo-drawer-footer">
+        <el-button class="common-button-default" size="mini"  icon="el-icon-close" @click="cancelStand">取消</el-button>
+        <el-button type="primary"  size="mini" class="common-button-primary" icon="el-icon-check" @click="okStand">添加</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -593,11 +721,34 @@ export default {
       loading: false,
       nonList: [], //未符合项表格数据
       replaceLoading: false,
+      standList: [],
+      productLines: [], //产品线数据
       //项目数据
       ProjectDatas: [],
+      dialogTableVisible: false,
       itemsData: [],
       selectItems: [],
       dataList: [],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standardData: [], //存放标准数据
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -685,9 +836,6 @@ export default {
       //数据查看
       historySee: false,
       historySeeForm: {},
-      // 新增编辑框的disabled
-      serialNumber: true,
-
       // 提交按钮loading
       submiting: false,
       // 选择人（单选）
@@ -749,6 +897,47 @@ export default {
         this.myLoading.loadData = false;
       });
     },
+    typeChange(type) {
+      console.log(type);
+      this.standardSearch.standType = type;
+    },
+    //取消添加
+    cancelStand(){
+      this.dialogTableVisible = false
+    },
+    //确认添加标准
+    okStand(){
+      if(this.standList > 1){
+        this.$message.warning('您只能选择一条标准进行添加')
+      }else if(this.standList < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.addForm.standId = this.standList[0].id
+        this.addForm.standName = this.standList[0].standName
+        this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
+        this.dialogTableVisible = false
+      }
+    },
+    //添加标准select的改变
+    selectStand(data) {
+      this.standList = data;
+    },
+    showStand(){
+      this.dialogTableVisible = true
+    },
+    //标准查询按钮
+    getStandDataBtn(){
+      this.page =1;
+      this.getStandDatas();
+    },
+    //清空查询按钮
+    clearStandSearch(){
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandDatas();
+    },
     // 点击历史记录按钮事件
     historyClick() {
       this.$router.push({
@@ -873,25 +1062,24 @@ export default {
 
       }
     },
-    //获取项目数据
-    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;
-        }
-      });
-
-    },
+    // //获取项目数据
+    // getProjectData() {
+    //   this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
+    //     page: 1,
+    //     pageSize: 100,
+    //   }, {
+    //     _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;
+    //     }
+    //   });
+    //
+    // },
     //提交
     submit() {
       const id = this.addForm.id;
@@ -1004,13 +1192,31 @@ export default {
         });*/
       });
     },
+    //查询项目下的标准
+    getStandDatas() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
+        this.total = res.data.count;
+      }, e => {
+      });
+    },
     //新增事件
     addModel() {
       this.dataList = []
-      this.serialNumber = true
       this.drawerTitle = "新增";
-      this.getProjectData()
       this.drawerTable = true
+      this.getStandDatas()
     },
     //编辑事件
     projectEdit(row) {
@@ -1022,9 +1228,8 @@ export default {
         }
       })
       let productId = this.projectId
-      this.getProjectData()
+      // this.getProjectData()
       this.getStandData(productId)
-      this.serialNumber = false
       this.drawerTable = true;
     },
     //点击查看按钮事件
@@ -1091,6 +1296,15 @@ export default {
       });
     },
     // 分页事件
+    pageChange(page) {
+      this.page = page;
+      this.getStandDatas()
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDatas()
+    },
+    // 分页事件
     pageChangeNo(page) {
       this.pageNo = page;
       this.getTableByPage();
@@ -1099,6 +1313,11 @@ export default {
       this.pageSizeNo = pageSize;
       this.getTableByPage();
     },
+    //产品线change事件
+    handleChangeLine(val){
+      this.addForm.productLine = val.productLine
+      this.ProjectDatas = val.sarStandProjectLibraries
+    },
 
     /** 项目名称change事件 */
     handleChange(val) {
@@ -1108,18 +1327,11 @@ export default {
       }
       this.addForm.productId = val.id
       this.addForm.productId = val.projectNumber
-      this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor
       this.serialNumber = false
-      let productId = val.id
-      this.getStandData(productId)
-    },
-    /** 标准号change事件 */
-    standChange(item) {
-      this.addForm.standId = item.standId
-      this.addForm.standName = item.standName
-      this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
+      // let productId = val.id
+      // this.getStandData(productId)
     },
     /** 责任工程师选择 */
     choiceZRR(type, title, id) {
@@ -1179,11 +1391,28 @@ export default {
       this.addForm.responsibleUnit = nameList;
 
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+        current: 1,
+        PageSize:100,
+      }, {
+        _this: this
+      }, res => {
+        res.data.records.forEach(item => {
+          if(item.productLine){
+            this.productLines.push(item)
+          }
+        })
+      }, e => {
+
+      });
+    },
 
   },
   mounted() {
-    //查询已维护的项目
-    this.getProjectData();
+    //查询产品线
+    this.getProductData()
     this.getData()
     // 加载所有的部门
     this.getOrgTreeSource();
@@ -1192,6 +1421,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 .el-select-dropdown__item.selected {
   color: #606266 !important;
 }
@@ -1270,6 +1502,5 @@ export default {
       }
     }
   }
-
 }
 </style>