检测内容评审样式细节修改

f54544bc · baiyanhao · df47b488 · f54544bc · f54544bc · f54544bc
Commit f54544bc authored Sep 12, 2024 by baiyanhao
15 changed files
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,7 +86,7 @@ export const constantRoutes = [
  },
  //去评审页面跳转 2024-9-5 16:25:29
  {
-    path: '/goreview',
+    path: '/review/sceneReview',
    component: () => import('@/views/review/sceneReview/index'),
    name: 'GoReview',
    hidden: true

--- a/src/views/review/already/index.vue
+++ b/src/views/review/already/index.vue
@@ -391,7 +391,7 @@ export default {
    /*查看按钮页面跳转 */
    handleDetail (row){
      this.$router.push({
-        path: `/review/view`,
+        path: `/review/views`,
        query: { id: row.id },
        // params:{  },
      })

--- a/src/views/review/createReview/deleteReviewDetails/index.vue
+++ b/src/views/review/createReview/deleteReviewDetails/index.vue
@@ -84,7 +84,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -131,7 +131,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleKeypoints = false"
+                  <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
                    >确认</el-button
                  >
                </div>
@@ -187,7 +187,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleDetails = false"
+                  <el-button type="primary" plain @click="dialogVisibleDetails = false"
                    >确认</el-button
                  >
                </div>
@@ -222,7 +222,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -579,10 +579,10 @@ export default {
            .then(response => {
              const aa = response
              if (aa) {
-                this.$message.success('提交成功 页面将在5秒后跳转')
+                this.$message.success('提交成功')
                this.timer = setTimeout(() => {
                  this.$router.push({ path: '/review/initiatedReview' })
-                }, 5000)
+                }, 200)
              } else {
                this.$message({
                  message: '提交失败',

--- a/src/views/review/createReview/deleteReviewKeypoints/index.vue
+++ b/src/views/review/createReview/deleteReviewKeypoints/index.vue
@@ -84,7 +84,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -130,7 +130,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleKeypoints = false"
+                  <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
                    >确认</el-button
                  >
                </div>
@@ -165,7 +165,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -538,10 +538,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/deleteReviewScene/index.vue
+++ b/src/views/review/createReview/deleteReviewScene/index.vue
@@ -91,7 +91,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -143,7 +143,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleKeypoints = false"
+                  <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
                    >确认</el-button
                  >
                </div>
@@ -203,7 +203,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleDetails = false"
+                  <el-button type="primary" plain @click="dialogVisibleDetails = false"
                    >确认</el-button
                  >
                </div>
@@ -263,7 +263,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleScene = false"
+                  <el-button type="primary" plain @click="dialogVisibleScene = false"
                    >确认</el-button
                  >
                </div>
@@ -279,7 +279,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -674,10 +674,10 @@ export default {
            .then(response => {
              const aa = response
              if (aa) {
-                this.$message.success('提交成功 页面将在5秒后跳转')
+                this.$message.success('提交成功')
                this.timer = setTimeout(() => {
                  this.$router.push({ path: '/review/initiatedReview' })
-                }, 5000)
+                }, 200)
              } else {
                this.$message({
                  message: '提交失败',

--- a/src/views/review/createReview/deleteUseCase/index.vue
+++ b/src/views/review/createReview/deleteUseCase/index.vue
@@ -104,7 +104,7 @@
                </collapse>
                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleUseCase = false"
+                  <el-button type="primary" plain @click="dialogVisibleUseCase = false"
                    >确认</el-button
                  >
                </div>
@@ -153,7 +153,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -552,10 +552,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/index.vue
+++ b/src/views/review/createReview/index.vue
@@ -412,12 +412,20 @@ export default {
  created() {
    this.getStandardList()
  },
-  mounted() {},
+  mounted() {
+  
+  },
  methods: {
+
    getStandardList() {
      testInitatereview(this.standardData)
        .then(response => {
          this.standardList = response.rows
+          this.selected = this.standardList[0].standardNo
+
+
+
+
          console.log(response, '1111')
        })
        .catch(error => {

--- a/src/views/review/createReview/newReviewDetails/index.vue
+++ b/src/views/review/createReview/newReviewDetails/index.vue
@@ -83,7 +83,7 @@
  
                  <!-- 弹窗底部 -->
                  <div slot="footer" class="dialog-footer">
-                    <el-button @click="dialogVisible = false">确认</el-button>
+                    <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                  </div>
                </el-dialog>
              </div>
@@ -131,7 +131,7 @@
  
                  <!-- 弹窗底部 -->
                  <div slot="footer" class="dialog-footer">
-                    <el-button @click="dialogVisibleKeypoints = false"
+                    <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
                      >确认</el-button
                    >
                  </div>
@@ -184,7 +184,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -530,10 +530,10 @@
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/newReviewKeypoints/index.vue
+++ b/src/views/review/createReview/newReviewKeypoints/index.vue
@@ -82,7 +82,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -134,7 +134,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -496,10 +496,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/newReviewScene/index.vue
+++ b/src/views/review/createReview/newReviewScene/index.vue
@@ -83,7 +83,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -130,7 +130,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleKeypoints = false"
+                  <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
                    >确认</el-button
                  >
                </div>
@@ -186,7 +186,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleDetails = false"
+                  <el-button type="primary" plain @click="dialogVisibleDetails = false"
                    >确认</el-button
                  >
                </div>
@@ -199,7 +199,7 @@

      <el-row>
        <el-col :span="3"><p></p></el-col>
-        <el-col :span="8">
+        <el-col :span="18">
          <el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
            <el-input
              v-model="formModel.shenchachangjing"
@@ -212,7 +212,7 @@
            >
            </el-input>
          </el-form-item> </el-col
-        ><el-col :span="10"><p></p></el-col>
+        ><el-col :span="3"><p></p></el-col>
      </el-row>

      <div class="subtitle">评审成员</div>
@@ -221,7 +221,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -242,7 +242,7 @@
      <div class="subtitle">备注信息</div>
      <el-row>
        <el-col :span="3"><p></p></el-col>
-        <el-col :span="8">
+        <el-col :span="18">
          <el-form-item label="">
            <el-input
              v-model="formModel.beizhuxinxi"
@@ -255,7 +255,7 @@
            >
            </el-input>
          </el-form-item>
-          <el-col :span="10"><p></p></el-col>
+          <el-col :span="3"><p></p></el-col>
        </el-col>
        <el-col :span="3"><p></p></el-col>
      </el-row>
@@ -585,10 +585,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/newUseCase/index.vue
+++ b/src/views/review/createReview/newUseCase/index.vue
@@ -80,7 +80,7 @@

                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button type="success" plain @click="dialogVisible = false">确认</el-button>
                </div>
              </el-dialog>
            </div>
@@ -128,7 +128,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -509,10 +509,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/createReview/reviewData/index.vue
+++ b/src/views/review/createReview/reviewData/index.vue
@@ -23,7 +23,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="标准条款" prop="biaozhuntiuaokuan">
-        <el-button type="primary" plain @click="handleReSelect"
+        <el-button type="success" plain @click="handleReSelect"
          >重新选择标准条款</el-button
        >
        <div style="display: flex">
@@ -110,7 +110,7 @@
      </el-form-item>
    </el-form>
    <div class="create-review-footer">
-      <el-button type="primary" class="next-button" @click="handleConfirm"
+      <el-button type="success" class="next-button" @click="handleConfirm"
        ><span
          class="el-icon-check"
          style="margin-right: 6px"

--- a/src/views/review/createReview/updateUseCase/index.vue
+++ b/src/views/review/createReview/updateUseCase/index.vue
@@ -96,7 +96,7 @@
                </collapse>
                <!-- 弹窗底部 -->
                <div slot="footer" class="dialog-footer">
-                  <el-button @click="handleSelectedUseCase()"
+                  <el-button type="primary" plain @click="handleSelectedUseCase()"
                    >确认</el-button
                  >
                </div>
@@ -159,7 +159,7 @@
        <el-col :span="18">
          <el-form-item label="">
            <div class="assessor-text">
-              评审人员:
+              <!-- 评审人员: -->
              <div class="review-members">
                <span
                  v-for="(reviewer, index) in receivedReviewer"
@@ -614,10 +614,10 @@ export default {
        .then(response => {
          const aa = response
          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
+            this.$message.success('提交成功')
            this.timer = setTimeout(() => {
              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
+            }, 200)
          } else {
            this.$message({
              message: '提交失败',

--- a/src/views/review/initiatedReview/index.vue
+++ b/src/views/review/initiatedReview/index.vue
@@ -37,11 +37,11 @@
      <el-form-item prop="type">
        <el-select
          v-model="queryParams.type"
-          placeholder="标准要求分类"
+          placeholder="检验类型"
          clearable
        >
          <el-option
-            v-for="dict in dict.type.type"
+            v-for="dict in dict.type.scene_type"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
@@ -131,7 +131,7 @@
      >
      </el-table-column>
      <el-table-column
-        label="标准要求分类"
+        label="检验类型"
        width="150"
        sortable
        align="left"
@@ -148,7 +148,7 @@
        :formatter="formatOperationSort"
      >
      </el-table-column>
-      <el-table-column label="场景内容" width="200" align="left" prop="newText">
+      <el-table-column label="评审内容" width="200" align="left" prop="newText">
      </el-table-column>
      <el-table-column
        label="评审人员"
@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test'
 export default {
  name: 'Index',
  mixins: [page],
-  dicts: ['review_status', 'review_type',  'type'],
+  dicts: ['review_status', 'review_type',  'scene_type'],

  data() {
    return {
@@ -276,15 +276,15 @@ export default {
  mounted() {},
  methods: {
    gainDictDataList() {
-      const obj = 'type'
+      const obj = 'scene_type'
      const obj1 = 'review_type'
      // 获取 review_type 字典数据
      getDicts('review_type').then(response => {
        this.reviewTypeList = response.data || []
      })

-      // 获取 type 字典数据
-      getDicts('type').then(response => {
+      // 获取 scene_type 字典数据
+      getDicts('scene_type').then(response => {
        this.typeList = response.data || []
      })
    },

--- a/src/views/review/wait/index.vue
+++ b/src/views/review/wait/index.vue
@@ -367,8 +367,11 @@ export default {
    /* 去评审按钮页面跳转*/
    handleReview(row) {
      this.$router.push({
-        path: `/goreview`,
-        query: { id: row.id }
+        path: `/review/sceneReview`,
+        query: { 
+          id: row.id, 
+          sort: row.operationSort
+        }
        // params:{  },
      })
    },