Merge branch 'master' of http://gitlab.91isoft.com:90/car-database/car-database-web

src/components/Page/chapterOption.vue

@@ -212,8 +212,7 @@ export default {
     },
     async loadData() {
       this.loading = true
-
-      getStandardListNew().then(res => {
+      await getStandardListNew().then(res => {
         this.tableData = res.data
         this.tableData = this.normalizeTreeData(this.tableData)
         forEach(this.tableData, (t1, index) => {
@@ -261,12 +260,13 @@ export default {
             type: this.tableData[0].children[0].value,
             name:'',
             chapter: '',
-            standardNo: ''
+            standardNo: this.tableData[0].standardNo
           }
           this.$store.dispatch('standard/setInitStandard', standard)
           this.$store.dispatch('standard/setStandardObj', standardObj)
           this.standard = standard
         })
+        this.loading = false
       })
       //console.log(this.standardList)
       // for(let i = 0; i < this.standardList.length ; i++ ){

src/views/plan/list/index.vue

@@ -221,9 +221,10 @@ export default {
     this.queryParams.isAsc = 'desc'
     this.queryParams.orderByColumn = 'createTime'
     this.view = this.$route.query.view
+    this.buttonDisabled = true
     setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
   },
   methods: {
     download(url) {
@@ -252,14 +253,14 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.loadData()
     },
     resetQuery() {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.queryParams = {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,

src/views/review/already/index.vue

@@ -288,6 +288,10 @@ export default {
     }
   },
   created(){
+    this.buttonDisabled = true
+      setTimeout(()=>{
+        this.buttonDisabled = false
+      },1000)
     this.gainDictDataList()
   },
   methods: {
@@ -405,7 +409,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.queryParams.page = 1
       this.getList()
     },
@@ -413,7 +417,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.getList()
     },
     getList(){

src/views/review/initiatedReview/index.vue

@@ -271,6 +271,10 @@ export default {
     }
   },
   created() {
+    this.buttonDisabled = true
+      setTimeout(()=>{
+        this.buttonDisabled = false
+      },1000)
     this.gainDictDataList()
   },
   mounted() {},
@@ -352,6 +356,10 @@ export default {
     },
     // 列表-查询
     handleQuery() {
+      this.buttonDisabled = true
+      setTimeout(()=>{
+        this.buttonDisabled = false
+      },1000)
       this.queryParams.page = 1
       this.getList()
     },
@@ -370,7 +378,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.loadData()
     },
     // 列表-重置
@@ -378,7 +386,7 @@ export default {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,

src/views/setting/company/index.vue

@@ -234,20 +234,24 @@ export default {
     this.queryParams.isAsc = 'desc'
     this.queryParams.orderByColumn = 'createTime'
     this.view = this.$route.query.view
+    this.buttonDisabled = true
+    setTimeout(()=>{
+        this.buttonDisabled = false
+      },1000)
   },
   methods: {
     handleQuery(){
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.loadData()
     },
     resetQuery() {
       this.buttonDisabled = true
       setTimeout(()=>{
         this.buttonDisabled = false
-      },2000)
+      },1000)
       this.queryParams = {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,

src/views/setting/standard/index.vue

@@ -251,6 +251,10 @@ export default {
     })
   },
   created() {
+    this.buttonDisibled = true
+    setTimeout(()=>{
+        this.buttonDisibled = false
+      },1000)
     this.queryParams.isAsc = 'desc'
     this.queryParams.orderByColumn = 'releaseDate'
   },
@@ -266,14 +270,14 @@ export default {
       this.loadData()
       setTimeout(() => {
 				this.buttonDisibled = false
-			}, 2000)
+			}, 1000)
     },
     handleQuery(){
       this.buttonDisibled = true
       this.loadData()
       setTimeout(() => {
 				this.buttonDisibled = false
-			}, 2000)
+			}, 1000)
     
     },
     sort_change(column, prop, order) {

src/views/setting/standardTerms/components/caseModel.vue

+<template>
+    <el-dialog
+      title="检验内容"
+      :visible.sync="dialogManger.dialogVisible"
+      width="60%"
+    >
+      <el-form class="form" :model="dialogManger">
+        <el-form-item class="title">
+          <span style="width: 500px">标准信息</span>
+        </el-form-item>
+        <el-form-item label="标准号" :label-width="formLabelWidth">
+          <el-input
+            class="input"
+            disabled
+            v-model="dialogManger.source.standard.standardNo"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="标准名称" :label-width="formLabelWidth">
+          <el-input
+            class="input"
+            disabled
+            v-model="dialogManger.source.standard.name"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="标准章节" :label-width="formLabelWidth">
+          <el-input
+            class="input"
+            disabled
+            v-model="dialogManger.source.standard.chapter"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审查类型" :label-width="formLabelWidth">
+          <el-input
+            class="input"
+            disabled
+            v-model="dialogManger.source.standard.type"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="标准要求" :label-width="formLabelWidth">
+          <el-input
+            class="textarea"
+            disabled
+            resize="none"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            type="textarea"
+            v-model="dialogManger.source.standard.text"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+  
+      <el-form
+        class="form"
+        :model="dialogManger"
+        title="'审查信息'"
+        style="margin-top: 10px"
+      >
+        <el-form-item class="title">
+          <span style="width: 500px">检验内容</span>
+        </el-form-item>
+        <el-form-item label="测试场景" :label-width="formLabelWidth">
+          <el-input
+            class="textarea"
+            disabled
+            resize="none"
+            :autosize="{ minRows: 1, maxRows: 6 }"
+            type="textarea"
+            v-model="dialogManger.source.judge.content"
+            autocomplete="off"
+          >
+          </el-input>
+        </el-form-item>
+        <div v-for="(item, index) in dialogManger.source.judge.caseInfo">
+          <el-form-item label="用例编号" :label-width="formLabelWidth">
+            <el-input
+              class="textarea"
+              disabled
+              resize="none"
+              :autosize="{ minRows: 1, maxRows: 6 }"
+              type="textarea"
+              v-model="item.customizedID"
+              autocomplete="off"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="用例描述" :label-width="formLabelWidth">
+            <el-input
+              class="textarea"
+              disabled
+              resize="none"
+              :autosize="{ minRows: 4, maxRows: 6 }"
+              type="textarea"
+              v-model="item.description" 
+              autocomplete="off"
+            ></el-input>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogManger.dialogVisible = false"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+  export default {
+    name: '',
+    data() {
+      return {
+        titleWidth: '500px',
+        formLabelWidth: '120px'
+      }
+    },
+    props: {
+      dialogManger: {
+        type: Object,
+        default: () => {
+          return {
+            dialogVisible: false,
+            refreshList: false,
+            source: {
+              standard: {
+                name: '',
+                standardNo:'', 
+                chapter: '',              
+                type:'',
+                text:'',
+              },
+              judge:{
+                caseNum:'',
+                reviewDetailsList:[]
+              }
+            },
+            dialogEditId: undefined
+          }
+        }
+      }
+    },
+    methods: {
+      cancel() {
+        this.dialogManger.dialogVisible = false
+      }
+    }
+  }
+  </script>
+  <style lang="scss" scoped>
+  .form .title {
+    width: 100%;
+    margin-right: 50px;
+    color: blue;
+    font-weight: bold;
+    border-left: blue solid 6px;
+    padding-left: 10px;
+  }
+  .form .input {
+    width: 100%;
+  }
+  .form .textarea {
+    width: 100%;
+  }
+  
+  ::v-deep .el-dialog__body {
+    height: 70vh;
+    overflow: auto;
+  }
+  .input ::v-deep .el-input__inner {
+    color: black;
+  }
+  .textarea ::v-deep .el-textarea__inner {
+    color: black;
+  }
+  </style>
+  
\ No newline at end of file