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

2022-04-19 16:44:23 +08:00
parent 3485a9a8b0 ced5c03807
commit 204253cf0f
13 changed files with 127 additions and 33 deletions
@@ -11,10 +11,10 @@
    <title>标准法规管理系统</title>
    <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
 <!--     vconsole调试工具-->
-    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
-    <script type="text/javascript">
-      var vConsole = new VConsole();
-    </script>
+<!--    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
+<!--    <script type="text/javascript">-->
+<!--      var vConsole = new VConsole();-->
+<!--    </script>-->
  </head>
  <body class="el-drawer-body">
    <div id="app"></div>
@@ -46,7 +46,8 @@ import 'vant/lib/index.css';
 //vant

 import animate from 'animate.css'
-
+import tool from './utils/tool'
+Vue.use(tool)
 // 引入路由器
 import router from './router'
 // 路由解析器
@@ -9,13 +9,13 @@
    </div>
    <ul>
      <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
-        <div style="height: 30px">
-          <span @click="dealWith(item)" v-if="item.prcName.length<24"
-                style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span>
-          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>
-            <span @click="dealWith(item)"
-                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>
-          </el-tooltip>
+        <div style="min-height: 30px">
+          <span @click="dealWith(item)"
+                style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
+<!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
+<!--            <span @click="dealWith(item)"-->
+<!--                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
+<!--          </el-tooltip>-->
        </div>
      </li>
    </ul>
@@ -437,6 +437,7 @@
                  v-model="plForm.technicalRequir"
                  placeholder="请输入核心技术要求"
                  maxlength="500"
+                  :autosize="{minRows:10,maxRows:10}"
                ></el-input>
              </el-form-item>
              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -1036,6 +1037,9 @@ export default {
    },
    handleTabs(name) {
      this.active = name
+      this.$nextTick(()=>{
+        this.$refs.filterTable.doLayout()
+      })
    },
    handleSave() {
      this.saveLoading = true
@@ -237,6 +237,7 @@
    </div>
    <!-- 选择已拆分标准抽屉-->
    <el-drawer
+      class="drawer-table"
      title="标准库"
      :visible.sync="ListModel"
      size="900px"
@@ -365,6 +366,7 @@
    </el-drawer>
    <!--    添加抽屉-->
    <el-drawer
+      class="drawer-table"
      title="添加项目群"
      :visible.sync="ProjectModel"
      size="950px"
@@ -1389,6 +1391,11 @@ export default {
  .demo-drawer-content {
    margin-top: 10px;
  }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>

@@ -235,6 +235,7 @@
    </div>
    <!-- 选择清单抽屉-->
    <el-drawer
+      class="drawer-table"
      title="选择清单"
      :visible.sync="ListModel"
      size="900px"
@@ -533,6 +534,7 @@
    </el-drawer>
    <!--    添加标准抽屉-->
    <el-drawer
+      class="drawer-table"
      title="添加标准"
      :visible.sync="standModel"
      size="900px"
@@ -1419,29 +1421,29 @@ export default {
    // 表格某一行的单击事件
    rowClick(row, column) {
      const selectData = this.selectList;
-      this.$refs.selection.clearSelection();
+      this.$refs.detailedSelection.clearSelection();
      if (selectData.length === 1) {
        selectData.forEach(item => {
          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
          if (item === row) {
-            this.$refs.selection.toggleRowSelection(row, false);
+            this.$refs.detailedSelection.toggleRowSelection(row, false);
          }
          // 不然就让当前的一行勾选
          else {
-            this.$refs.selection.toggleRowSelection(row, true);
+            this.$refs.detailedSelection.toggleRowSelection(row, true);
          }
        });
      } else {
-        this.$refs.selection.toggleRowSelection(row, true);
+        this.$refs.detailedSelection.toggleRowSelection(row, true);
      }
    },
    select(selection, row) {
      // 清除 所有勾选项
-      this.$refs.selection.clearSelection();
+      this.$refs.detailedSelection.clearSelection();
      // 当表格数据都没有被勾选的时候 就返回
      // 主要用于将当前勾选的表格状态清除
      if (selection.length === 0) return;
-      this.$refs.selection.toggleRowSelection(row, true);
+      this.$refs.detailedSelection.toggleRowSelection(row, true);
    },
    //标准表格选择框改变
    selectStandChange(data) {
@@ -1633,5 +1635,10 @@ export default {
    height: calc(~'100% - 65px');
    overflow: auto;
  }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>
@@ -235,6 +235,7 @@
    </div>
    <!-- 选择清单抽屉-->
    <el-drawer
+      class="drawer-table"
      title="选择清单"
      :visible.sync="ListModel"
      size="900px"
@@ -503,6 +504,7 @@
    </el-drawer>
    <!--    添加标准抽屉-->
    <el-drawer
+      class="drawer-table"
      title="添加标准"
      :visible.sync="standModel"
      size="900px"
@@ -1387,12 +1389,13 @@ export default {
      }
    },
    select(selection, row) {
+      console.log(selection);
      // 清除 所有勾选项
-      this.$refs.selection.clearSelection()
+      this.$refs.detailedSelection.clearSelection()
      // 当表格数据都没有被勾选的时候 就返回
      // 主要用于将当前勾选的表格状态清除
      if(selection.length === 0) return
-      this.$refs.selection.toggleRowSelection(row, true)
+      this.$refs.detailedSelection.toggleRowSelection(row, true)
    },
    //添加标准select的改变
    selectThree(data) {
@@ -1401,21 +1404,21 @@ export default {
    // 表格某一行的单击事件
    rowClick(row, column) {
      const selectData = this.selectList
-      this.$refs.selection.clearSelection()
+      this.$refs.detailedSelection.clearSelection()
      if( selectData.length === 1 ) {
        selectData.forEach(item => {
          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
          if (item === row) {
-            this.$refs.selection.toggleRowSelection(row, false);
+            this.$refs.detailedSelection.toggleRowSelection(row, false);
          }
          // 不然就让当前的一行勾选
          else {
-            this.$refs.selection.toggleRowSelection(row, true);
+            this.$refs.detailedSelection.toggleRowSelection(row, true);
          }
        })
      }
      else {
-        this.$refs.selection.toggleRowSelection(row, true);
+        this.$refs.detailedSelection.toggleRowSelection(row, true);
      }
    },
    choiceZRR(type, title, id) {
@@ -1595,5 +1598,10 @@ export default {
    height: calc(~'100% - 65px');
    overflow: auto;
  }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>
@@ -1771,11 +1771,16 @@
                <el-col :span="12">
                  <!--            归口管理部门-->
                  <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>
-                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="index" :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
+                    <search-select
+                      v-model="advanceSearchMapping.GKDW"
+                      :placeholder="'归口管理部门'"
+                      :options="gkglbmOptions"
+                      clearable/>
+<!--                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>-->
+<!--                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="index" :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
                  </el-form-item>
                  <!--            我司参与深度-->
                  <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
@@ -809,7 +809,7 @@
                        {required: true, message: '请选择起草人', trigger: 'change'},
                    ],
                    rqbJson: [
-                        {required: true, message: '请选择代替企标编号', trigger: 'change'},
+                        {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
                    ]
                },
                form: {
@@ -1038,6 +1038,7 @@
                }
                this.addForm.unit = list
                this.addForm.unitName = listName
+                this.$refs.addForm.validateField('unitName')
                this.modalshowflagZRBM = false
            },
            choiceZRBM(id) {
@@ -1161,7 +1162,32 @@
            },
            addData () {
                this.addDrawerTitle = '新增'
-                this.addForm = {}
+                this.addForm = {
+                  bussSort:'',
+                  esMatingRelations: '',
+                  technologic: '',
+                  useLevel: '',
+                  isRelate: '',
+                  esStandRelations: '',
+                  area: [],
+                  tsJson: '',
+                  tsJsonName: '',
+                  rqbJson: '',
+                  rqbName: '',
+                  unit: '', // 单位
+                  unitName: '',
+                  esName: '', // 企标名称
+                  planStatus: '', // 计划状态
+                  reviseStatus: '', // 制修订状态
+                  resPerson: '', // 评审责任人
+                  resPersonName: '',
+                  wgLeader: '', // 工作组组长
+                  wgLeaderName: '',
+                  draftTime: '', // 计划标准初稿完成时间
+                  releaseTime: '', // 计划标准发布时间
+                  drafter: '', // 起草人
+                  drafterName: ''
+                }
                this.DrawerType = 'add'
                this.addForm.planStatus = '0'
                this.addDrawer = true
@@ -457,7 +457,7 @@ export default {
      let routeUrl = this.$router.resolve({
        name: 'OtherStandardDetails',
        params: {
-          id: item.id,
+          id: item.standId,
          pageType: 'INLAND_STAND'
          // pageType: item.standType + '_STAND'
        }
@@ -896,6 +896,7 @@ export default {
    },
    showStand(){
      this.dialogTableVisible = true
+      this.getStandDataBtn()
    },
    //标准查询按钮
    getStandDataBtn(){
@@ -388,6 +388,7 @@ export default {
          console.log(res.data.records);
          this.total = res.data.total
          this.spinShow = false
+          localStorage.setItem('refreshFlag', false)
        }, e => {
        })
      },
@@ -557,6 +558,13 @@ export default {
      },
      handleQueryPdf(file){
        window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
+      },
+      isVisible(e) {
+        if (e.target.visibilityState === "visible") {
+          this.getList()
+        } else if (e.target.visibilityState === "hidden") {
+          this.getList()
+        }
      }
    },
    watch: {
@@ -572,6 +580,17 @@ export default {
      ...mapGetters(['refreshFlag'])
    },
    mounted() {
+      const that = this;
+      //监听缓存中指定key的值变化
+      window.addEventListener("setItemEvent",function(e){
+        //e.key : 是值发生变化的key
+        //例如 e.key==="token";
+        //e.newValue : 是可以对应的新值
+        if(e.key === "refreshFlag" && e.newValue === true){
+          this.getList()
+        }
+      })
+      document.addEventListener('visibilitychange', that.isVisible)
      if (this.lawsStand) {
        this.form = {
          ideaId: this.lawsStand.id,
@@ -613,7 +632,10 @@ export default {
      this.getList()
      this.getIdeaKey()
      this.getFileInfo()
-    }
+    },
+    destroyed() {
+      document.removeEventListener('visibilitychange', this.isVisible)
+    },
  }
 </script>

@@ -0,0 +1,13 @@
+function dispatchEventStroage() {
+  const signSetItem = localStorage.setItem
+  localStorage.setItem = function(key, val) {
+    let setEvent = new Event('setItemEvent')
+    setEvent.key = key
+    setEvent.newValue = val
+    window.dispatchEvent(setEvent)
+    signSetItem.apply(this, arguments)
+  }
+}
+
+export default dispatchEventStroage
+