From 1d78fdb4a9a8731d91af17709defb1e1807dcec8 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Fri, 24 Dec 2021 09:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8A=BD=E5=B1=89=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E3=80=81=E6=9C=AA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/otherAddEit.vue                     | 178 ------------------
 .../pages/projectAddEit.vue                   | 152 ---------------
 .../nonConfomity/pages/historicalData.vue     |  40 +---
 3 files changed, 4 insertions(+), 366 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 001596b81..81dce1559 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -331,34 +331,6 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-<!--        <el-table-column
-          show-overflow-tooltip
-          prop="cycvppsbm"
-          width="210px"
-          align="center"
-          label="乘用车VPPS编码">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="cycvppscn"
-          width="210px"
-          align="center"
-          label="乘用车VPPS中文名称">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="kccvppsbm"
-          align="center"
-          width="210px"
-          label="卡车VPPS编码">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="kccvppscn"
-          align="center"
-          width="210px"
-          label="卡车VPPS中文名称">
-        </el-table-column>-->
         <el-table-column width="160" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -373,12 +345,6 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
-<!--            <el-button-->
-<!--              size="small"-->
-<!--              @click="editTghisRow(scope.row)"-->
-<!--              class="common-button-default"-->
-<!--              type="warning"-->
-<!--            >编辑</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -415,91 +381,6 @@
         </div>
       </el-upload>
     </el-dialog>
-    <!--编辑-->
-    <el-drawer
-      title="编辑清单条目"
-      :visible.sync="drawerEdit"
-      :wrapperClosable="false"
-      :before-close='cancelInfo'
-      size="800px"
-    >
-      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
-        <el-form-item label="标准号">
-          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准名称" prop="standName">
-          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="英文名称" prop="standEnName">
-          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用车型" prop="typeApplicable">
-          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="能源类型" prop="nylx">
-          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准实施日期" prop="ssrq">
-          <el-date-picker
-            v-model.trim="editRowData.ssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrq">
-          <el-date-picker
-            v-model.trim="editRowData.zccssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrq">
-          <el-date-picker
-            v-model.trim="editRowData.xcxssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="责任部门" prop="zrbm">
-          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用产品线" prop="sycpx">
-          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
-        </el-form-item>
-<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>-->
-      </el-form>
-      <div class="demo-drawer-footer">
-        <el-button
-          type="primary"
-          class="common-button-primary"
-          size="mini"
-          icon="el-icon-check"
-          @click="saveInfo"
-        >提交</el-button
-        >
-        <el-button
-          size="mini"
-          icon="el-icon-close"
-          class="common-button-default"
-          @click="cancelInfo"
-        >取消</el-button
-        >
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
@@ -555,26 +436,6 @@ export default {
       zrbmMap: {},
       sycpxMap: {},
       selectSearch : [],
-      // 编辑抽屉状态
-      drawerEdit: false,
-      // 编辑框数据
-      editRowData: {
-        id: '',
-        standName: '',
-        standSortShow:'',
-        standEnName: '',
-        typeApplicable: '',
-        nylx: '',
-        ssrq: '',
-        zccssrq: '',
-        xcxssrq: '',
-        zrbm: '',
-        sycpx: '',
-        cycvppsbm: '',
-        cycvppscn: '',
-        kccvppsbm: '',
-        kccvppscn: ''
-      },
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -1217,45 +1078,6 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
-    // 编辑按钮
-    editTghisRow(row) {
-      // 用来储存取消时原来的数据，防止取消时修改
-      localStorage.setItem('obj', JSON.stringify(row))
-
-      this.rowList = row
-      this.editRowData = this.rowList
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
-      }
-      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
-      }
-      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
-      }
-      this.drawerEdit = true
-    },
-    // 抽屉取消按钮
-    cancelInfo() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrq = Item.zccssrq
-      this.drawerEdit = false
-    },
-    // 抽屉提交按钮
-    saveInfo() {
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
-      }
-      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
-      }
-      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
-      }
-      this.drawerEdit = false
-    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 5dd637b43..dfec4ebff 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -405,13 +405,6 @@
                 v-if="!disabledFlag"
             >下移
             </el-button>
-<!--            <el-button-->
-<!--                size="small"-->
-<!--                @click="editTghisRow(scope.row)"-->
-<!--                class="common-button-default"-->
-<!--                type="warning"-->
-<!--            >编辑-->
-<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -453,92 +446,6 @@
         </div>
       </el-upload>
     </el-dialog>
-    <el-drawer
-        title="编辑清单条目"
-        :visible.sync="drawerEdit"
-        :before-close='cancelInfo'
-        :wrapperClosable="false"
-        size="800px"
-    >
-      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
-        <el-form-item label="标准号">
-          <el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准名称" prop="standName">
-          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="英文名称" prop="standEnName">
-          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用车型" prop="typeApplicable">
-          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="能源类型" prop="nylx">
-          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准实施日期" prop="ssrq">
-          <el-date-picker
-              v-model.trim="editRowData.ssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrq">
-          <el-date-picker
-              v-model.trim="editRowData.zccssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrq">
-          <el-date-picker
-              v-model.trim="editRowData.xcxssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="责任部门" prop="zrbm">
-          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用产品线" prop="sycpx">
-          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
-        </el-form-item>
-<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>-->
-      </el-form>
-      <div class="demo-drawer-footer">
-        <el-button
-            type="primary"
-            class="common-button-primary"
-            size="mini"
-            icon="el-icon-check"
-            @click="saveInfo"
-        >提交
-        </el-button
-        >
-        <el-button
-            size="mini"
-            icon="el-icon-close"
-            class="common-button-default"
-            @click="cancelInfo"
-        >取消
-        </el-button
-        >
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
@@ -609,27 +516,6 @@ export default {
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
-      // 编辑抽屉状态
-      drawerEdit: false,
-      // 编辑框数据
-      editRowData: {
-        id: '',
-        standName: '',
-        standSortShow: '',
-        standEnName: '',
-        typeApplicable: '',
-        syrz: '',
-        nylx: '',
-        ssrq: '',
-        zccssrq: '',
-        xcxssrq: '',
-        zrbm: '',
-        sycpx: '',
-        cycvppsbm: '',
-        cycvppscn: '',
-        kccvppsbm: '',
-        kccvppscn: ''
-      },
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
         type: [
@@ -1188,44 +1074,6 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
-    // 编辑按钮
-    editTghisRow(row) {
-      // 用来储存取消时原来的数据，防止取消时修改
-      localStorage.setItem('obj', JSON.stringify(row))
-      this.rowList = row
-      this.editRowData = this.rowList
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
-      }
-      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
-      }
-      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
-      }
-      this.drawerEdit = true
-    },
-    // 抽屉取消按钮
-    cancelInfo() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrq = Item.zccssrq
-      this.drawerEdit = false
-    },
-    // 抽屉提交按钮
-    saveInfo() {
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
-      }
-      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
-      }
-      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
-      }
-      this.drawerEdit = false
-    },
     // 点击清单条目导入按钮事件
     importmodalFlags() {
       this.importmodalFlag = true
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index da065c8d0..7f7c0f7f4 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -11,7 +11,7 @@
       <div class="left">
         <el-form :modal="historySearch" :inline="true" class="label-input-form" >
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="historySearch.standId"
+            <el-input v-model="historySearch.standSerialNumber"
                       placeholder="请输入"
                       clearable
                       @keyup.enter="getTableBtn"
@@ -25,39 +25,9 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
-              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
-                {{ opt.label}}</el-option>
-            </el-select>
+            <el-input v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+            </el-input>
           </el-form-item>
-<!--          <el-form-item label="责任部门" class="search-item">-->
-<!--            <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
-<!--            <el-popover-->
-<!--              placement="bottom"-->
-<!--              popper-class="user-dept-popper"-->
-<!--              trigger="click"-->
-<!--              :value="false"-->
-<!--            >-->
-<!--              <el-input-->
-<!--                slot="reference"-->
-<!--                v-model="historySearch.responseUnitShow"-->
-<!--                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"
@@ -144,7 +114,7 @@
           label="责任部门">
         </el-table-column>
         <el-table-column
-          prop="dutyEngineer"
+          prop="dutyEngineerName"
           width="150"
           align="center"
           label="责任工程师">
@@ -666,8 +636,6 @@ export default {
       _this: this
     }, res => {
       this.allSelectOptions = res.data || {}
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {