Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

2021-07-21 15:46:53 +08:00
parent e220e9c1f4 c274b139e9
commit 4c4541cd63
8 changed files with 395 additions and 131 deletions
@@ -3619,23 +3619,6 @@
            "upath": "^1.1.1"
          }
        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
        "commander": {
          "version": "2.20.3",
          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4581,94 +4564,6 @@
            }
          }
        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.3.0",
-          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz",
-          "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-              "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "big.js": {
-              "version": "5.2.2",
-              "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
-              "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
-              "dev": true,
-              "optional": true
-            },
-            "chalk": {
-              "version": "4.1.1",
-              "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
-              "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "emojis-list": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
-              "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
-              "dev": true,
-              "optional": true
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-              "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-              "dev": true,
-              "optional": true
-            },
-            "json5": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
-              "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "^1.2.5"
-              }
-            },
-            "loader-utils": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-              "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622293630895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-              "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
        "vue-style-loader": {
          "version": "4.1.2",
          "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -9313,7 +9208,7 @@
    },
    "image-size": {
      "version": "0.5.5",
-      "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
      "dev": true,
      "optional": true
@@ -13622,6 +13517,94 @@
      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz",
      "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q=="
    },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.3.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz",
+      "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "hash-sum": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
    "vue-router": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
@@ -159,8 +159,20 @@
            :visible.sync="modalshowflag2"
            :wrapperClosable="false"
            size="800px">
+      <el-form
+              ref="attributeEO"
+              class="label-input-form"
+              :inline="true"
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+                  v-model="filterText2"
+                  placeholder="请输入姓名"
+          ></el-input>
+        </el-form-item>
+      </el-form>
      <el-tree
-              v-if="modalshowflag2"
+              v-if="modalshowflag2 && open2"
              style="height: 100%; overflow: auto;"
              node-key="id"
              class="filter-tree"
@@ -169,23 +181,52 @@
              :default-checked-keys="nodeList2"
              highlight-current
              check-strictly
-              default-expand-all
              :expand-on-click-node="false"
              show-checkbox
+              ref="tree2"
+              :load="loadNode"
+              lazy>
+      </el-tree>
+      <el-tree
+              v-if="modalshowflag2 && !open2"
+              style="height: 100%; overflow: auto;"
+              node-key="id"
+              class="filter-tree"
+              :data="treeData2"
+              :props="defaultProps"
+              :default-checked-keys="nodeList2"
+              highlight-current
+              check-strictly
+              :expand-on-click-node="false"
+              default-expand-all
+              show-checkbox
              ref="tree2">
      </el-tree>
      <div id="roleFormButton2" class="demo-drawer-footer">
        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
      </div>
+      <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
    </el-drawer>
    <el-drawer
            :title="drawerTitle"
            :visible.sync="modalshowflag"
            :wrapperClosable="false"
            size="800px">
+      <el-form
+              ref="attributeEO"
+              class="label-input-form"
+              :inline="true"
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+                  v-model="filterText1"
+                  placeholder="请输入姓名"
+          ></el-input>
+        </el-form-item>
+      </el-form>
      <el-tree
-              v-if="modalshowflag"
+              v-if="modalshowflag && open1"
              node-key="id"
              style="height: 100%; overflow: auto;"
              class="filter-tree"
@@ -195,15 +236,33 @@
              highlight-current
              check-strictly
              @check="drawerCheck"
-              default-expand-all
              :expand-on-click-node="false"
              show-checkbox
+              ref="tree"
+              :load="loadNode"
+              lazy>
+      </el-tree>
+      <el-tree
+              v-if="modalshowflag && !open1"
+              node-key="id"
+              style="height: 100%; overflow: auto;"
+              class="filter-tree"
+              :data="treeData1"
+              :props="defaultProps"
+              :default-checked-keys="nodeList"
+              highlight-current
+              check-strictly
+              @check="drawerCheck"
+              :expand-on-click-node="false"
+              default-expand-all
+              show-checkbox
              ref="tree">
      </el-tree>
      <div id="roleFormButton" class="demo-drawer-footer">
        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
      </div>
+      <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
    </el-drawer>
    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
      <el-upload
@@ -236,6 +295,13 @@ export default {
  name: "bzdyStep1",
  data() {
    return {
+      treeLoading: false,
+      treeData2: [],
+      treeData1: [],
+      open1: true,
+      open2: true,
+      filterText1: '',
+      filterText2: '',
      commentText: '',
      roleRow: {},
      nodeList: [],
@@ -310,12 +376,56 @@ export default {
    ProcessFooter,
    ProcessTitle
  },
+  watch: {
+    filterText1 (val) {
+      if (val.length) {
+        this.open1 = false
+        this.treeLoading = true
+        this.$http.get('SarInstitution/institution/institutionAndUser', {
+          userName: val
+        }, {}, res => {
+          this.treeData1 = res.data
+          this.treeLoading = false
+        })
+      } else {
+        this.open1 = true
+      }
+    },
+    filterText2 (val) {
+      if (val.length) {
+        this.open2 = false
+        this.treeLoading = true
+        this.$http.get('SarInstitution/institution/institutionAndUser', {
+          userName: val
+        }, {}, res => {
+          this.treeData2 = res.data
+          this.treeLoading = false
+        })
+      } else {
+        this.open2 = true
+      }
+    },
+  },
  methods: {
+    loadNode(node, resolve) {
+      if (node.level === 0) {
+        return resolve(this.treeData);
+      }
+      this.getChildren(node, resolve)
+    },
+    getChildren (node, resolve) {
+     this.$http.get('SarInstitution/institution/getNext', {
+       institutionId: node.key
+     }, {}, res => {
+       resolve(res)
+     })
+    },
    choiceZRRS () {
      this.nodeList2 = []
      if ( this.roleForm.dockUserList.length > 0) {
        this.nodeList2 = this.roleForm.dockUserList.split(',')
      }
+      this.filterText2 = ''
      this.modalshowflag2 = true
    },
    saveUserInfo2 () {
@@ -410,11 +520,14 @@ export default {
      this.nodeList.push(id)
      this.type = type
      this.drawerTitle = title
+      this.filterText1 = ''
      this.modalshowflag = true
    },
    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
+      this.treeLoading = true
+      this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> {
+        this.treeData = res
+        this.treeLoading = false
      })
    },
    handleTabs(name) {
@@ -87,7 +87,7 @@
          label="国家/地区"
          align="center">
          <template slot-scope="scope">
-            <span v-if="scope.row.countryArea.indexOf(',') >= 0">
+            <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',')  > 0">
              <span>{{ scope.row.countryArea }}</span>
            </span>
            <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
@@ -138,7 +138,7 @@
          label="更新时间"
          align="center">
          <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
          </template>
        </el-table-column>
        <el-table-column
@@ -70,6 +70,7 @@
                  :on-remove="delFileInfo"
                  :on-success="uploadBackSuccess"
                  :before-upload="beforeUpload"
+                  :on-preview="handleOnPreview"
              >
                <el-button class="common-button-default" size="mini">
                  点击上传
@@ -225,17 +226,26 @@
              prop="issueTime"
              sortable
              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"
+              prop="xcxssrqgj"
              sortable
              label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
          </el-table-column>
          <el-table-column
              show-overflow-tooltip
-              prop="zccssrq"
+              prop="zccssrqgj"
              sortable
              label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
          </el-table-column>
          <el-table-column
              show-overflow-tooltip
@@ -376,6 +386,9 @@
          width="210px"
          align="center"
          label="在产车实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
        </el-table-column>
        <el-table-column
          prop="xcxssrqgj"
@@ -383,6 +396,9 @@
          align="center"
          width="210px"
          label="新车型实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
        </el-table-column>
        <el-table-column
          show-overflow-tooltip
@@ -443,7 +459,6 @@
            <el-button
              class="common-button-default"
              type="danger"
-              style="margin-left: 0px"
              size="small" @click="moveDown(scope.$index, scope.row)"
              v-if="!disabledFlag"
            >下移</el-button>
@@ -554,6 +569,7 @@ export default {
      nylxMap: {},
      zrbmMap: {},
      sycpxMap: {},
+      zrbmOptions: [],
      selectSearch : [],
      // 新增、编辑 基础信息字段
      sarAccessEO: {
@@ -879,6 +895,14 @@ export default {
        fileList.pop()
      }
    },
+
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
    // 相关附件 上传之前钩子
    beforeUpload (file) {
      var filename = file.name
@@ -1257,6 +1281,19 @@ export default {
        _this: this
      }, res =>{
        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
+        console.log(this.sarAccessInfoSearchList)
      }, e => {
      })
    },
@@ -1714,6 +1751,7 @@ export default {
        _this: this
      }, res => {
        this.sarAccessInfoList = res.data
+        console.log(res.data)
      }, e => {
      })
    },
@@ -55,6 +55,7 @@
                :on-remove="delFileInfo"
                :on-success="uploadBackSuccess"
                :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
              >
                <el-button class="common-button-default" size="mini">
                  点击上传
@@ -210,17 +211,26 @@
            prop="issueTime"
            sortable
            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"
+            prop="xcxssrqgj"
            sortable
            label="新车型实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
          </el-table-column>
          <el-table-column
            show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
            sortable
            label="在产车实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
          </el-table-column>
          <el-table-column
            show-overflow-tooltip
@@ -361,6 +371,9 @@
          width="210px"
          align="center"
          label="在产车实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
        </el-table-column>
        <el-table-column
          prop="xcxssrqgj"
@@ -368,6 +381,9 @@
          align="center"
          width="210px"
          label="新车型实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
        </el-table-column>
        <el-table-column
          show-overflow-tooltip
@@ -417,7 +433,7 @@
          width="210px"
          label="卡车VPPS中文名称">
        </el-table-column>
-        <el-table-column>
+        <el-table-column width="150">
          <template slot-scope="scope">
            <el-button
              class="common-button-default"
@@ -538,6 +554,7 @@ export default {
      nylxMap: {},
      zrbmMap: {},
      sycpxMap: {},
+      zrbmOptions: [],
      selectSearch : [],
      // 新增、编辑 基础信息字段
      sarAccessEO: {
@@ -1241,8 +1258,19 @@ export default {
        _this: this
      }, res =>{
        this.sarAccessInfoSearchList = res.data.list
-        this.$nextTick(() => {
-        })
+        this.sarAccessInfoSearchList.forEach(item => {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          })
+          console.log(this.sarAccessInfoSearchList)
      }, e => {

      })
@@ -1716,7 +1744,14 @@ export default {
        this.$set(this.zrbmMap, item.value, item.label)
        this.$set(this.sycpxMap, item.value, item.label)
      })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
  },
  watch: {
    // 监听 清单类型
@@ -55,6 +55,7 @@
                :on-remove="delFileInfo"
                :on-success="uploadBackSuccess"
                :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
              >
                <el-button class="common-button-default" size="mini">
                  点击上传
@@ -210,17 +211,26 @@
            prop="issueTime"
            sortable
            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"
+            prop="xcxssrqgj"
            sortable
            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
          </el-table-column>
          <el-table-column
            show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
            sortable
            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
          </el-table-column>
          <el-table-column
            show-overflow-tooltip
@@ -361,6 +371,9 @@
          width="210px"
          align="center"
          label="在产车实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
        </el-table-column>
        <el-table-column
          prop="xcxssrqgj"
@@ -368,6 +381,9 @@
          align="center"
          width="210px"
          label="新车型实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
        </el-table-column>
        <el-table-column
          show-overflow-tooltip
@@ -428,7 +444,6 @@
            <el-button
              class="common-button-default"
              type="danger"
-              style="margin-left: 0px"
              size="small" @click="moveDown(scope.$index, scope.row)"
              v-if="!disabledFlag"
            >下移</el-button>
@@ -539,6 +554,7 @@ export default {
      nylxMap: {},
      zrbmMap: {},
      sycpxMap: {},
+      zrbmOptions: [],
      selectSearch : [],
      // 新增、编辑 基础信息字段
      sarAccessEO: {
@@ -1243,6 +1259,19 @@ export default {
        _this: this
      }, res =>{
        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
+        console.log(this.sarAccessInfoSearchList)
      }, e => {

      })
@@ -1716,7 +1745,14 @@ export default {
        this.$set(this.zrbmMap, item.value, item.label)
        this.$set(this.sycpxMap, item.value, item.label)
      })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
  },
  watch: {
    // 监听 清单类型
@@ -30,7 +30,7 @@
        </div>
      </el-card>
      <div class="action-bar">
-        <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+        <el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button>
        <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
        <el-button class="common-button-default export-button"
                   size="mini" @click="exportStandard"
@@ -143,6 +143,42 @@
      <div class="demo-drawer-content">
        <div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0">
          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <!-- 顶部工具栏 -->
+            <table-tools-bar>
+              <div slot="left">
+                <div class="search-area">
+                  <el-form :model="standCommonlySearch" inline class="label-input-form">
+                    <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                      <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                    </el-formItem>
+                    <el-formItem label="标准类别" prop="standSort" class="search-item">
+                      <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
+                        <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                        </el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem label="标准来源" prop="standType" class="search-item">
+                      <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                        <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                        <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem class="search-item btn-box">
+                      <el-button
+                        type="primary"
+                        size="mini"
+                        class="common-button-primary"
+
+                        @click="search">查询</el-button>
+                      <el-button
+                        class="common-button-default"
+                        size="mini"
+                        @click="clearSearch">清空</el-button>
+                    </el-formItem>
+                  </el-form>
+                </div>
+              </div>
+            </table-tools-bar>
            <el-table
                :data="standardData"
                tooltip-effect="dark"
@@ -233,6 +269,12 @@ export default {
  },
  data () {
    return {
+      standSortOptions: [],
+      standCommonlySearch: {
+        standSort: '',
+        standNumber: '',
+        standType: ''
+      },
      size: this.$store.getters.userInfo.configContent,
      pageSizeNo: this.$store.getters.userInfo.configContent,
      pageSize: this.$store.getters.userInfo.configContent,
@@ -260,6 +302,19 @@ export default {
    }
  },
  methods: {
+    // 搜索
+    search() {
+      this.pageNo = 1
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList()
+    },
+    clearSearch() {
+      this.pageNo = 1
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
+      this.addList()
+    },
    pageChange(page) {
      this.page = page;
      this.selectionList();
@@ -285,7 +340,10 @@ export default {
    addList() {
      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
        page:this.pageNo,
-        pageSize:this.pageSizeNo
+        pageSize:this.pageSizeNo,
+        standSort: this.standCommonlySearch.standSort,
+        standNumber: this.standCommonlySearch.standNumber,
+        standType: this.standCommonlySearch.standType
      }, {
        _this:this,
      }, res => {
@@ -555,6 +613,7 @@ export default {
        _this: this,
        loading: 'loading'
      }, res => {
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
        this.showLocalProductData(this.getLocalPro)
      }, e => {
      })
@@ -750,4 +809,4 @@ export default {
 .demo-drawer-content {
     margin-top: 10px;
 }
-</style>
+</style>
@@ -86,7 +86,7 @@ module.exports = {
        }
      },
      '/onlyOffice': {
-        target: 'http://172.20.10.2:8888',
+        target: 'http://10.96.10.171',
        changeOrigin: true,
        pathRewrite: {
          '^/onlyOffice': '/api'