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

src/views/review/already/index.vue

 <template>
   <page-standard>
     <!--1-抬头标题-->
-    <div class="title-style">
-      <div class="title-content-style">我的已审</div>
-    </div>
+    <!--    <div class="title-style">-->
+    <!--      <div class="title-content-style">我的已审</div>-->
+    <!--    </div>-->
     <div class="content-display">
       <el-form
         v-show="showSearch"

src/views/review/createReview/index.vue

@@ -2,6 +2,7 @@
   <page-standard class="create-review">
     <div slot="tab">
       <el-form
+        v-if="pageIndex === 0"
         ref="queryForm"
         class="tab-form"
         :model="formModel"
@@ -19,8 +20,35 @@
           </el-select>
         </el-form-item>
       </el-form>
+      <div v-if="pageIndex === 1" style="display: flex">
+        <div style="flex-shrink: 0">
+          发起评审（{{
+            selectDictLabel(
+              dict.type.create_review_type,
+              formModel.reviewType
+            ) +
+            '-' +
+            selectDictLabel(
+              dict.type.create_review_subtype,
+              formModel.reviewSubtype
+            )
+          }}）
+        </div>
+        <div
+          style="
+            flex-grow: 1;
+            text-align: right;
+            color: #1890ff;
+            text-decoration: underline;
+            cursor: pointer;
+          "
+          @click="handleGoBack"
+        >
+          返回
+        </div>
+      </div>
     </div>
-    <div class="create-review-content">
+    <div v-if="pageIndex === 0" class="create-review-content">
       <div class="center-tip">
         <div class="el-icon-time icon-custon-style" />
         <div class="center-tip-text">请选择要发起的评审类型</div>
@@ -46,32 +74,48 @@
         >
       </div>
       <div class="create-review-footer">
-        <el-button type="primary" class="next-button">下一步</el-button>
+        <el-button type="primary" class="next-button" @click="pageIndex = 1"
+          >下一步</el-button
+        >
       </div>
     </div>
+    <ReviewData v-if="pageIndex === 1" :form-model="formModel" />
   </page-standard>
 </template>
 
 <script>
+import ReviewData from './reviewData'
 export default {
   name: 'CreateReview',
   dicts: ['create_review_type', 'create_review_subtype'],
+  components: {
+    ReviewData
+  },
   data() {
     return {
+      pageIndex: 0,
       formModel: {
         ask: '1',
-        reviewType: '',
-        reviewSubtype: ''
+        reviewType: '0',
+        reviewSubtype: '0'
       }
     }
   },
   mounted() {},
   methods: {
+    // 按钮-选择类型
     handleSelectType(reviewType, reviewSubtype) {
       console.log('评审类型 = ', reviewType)
       console.log('评审子类型 = ', reviewSubtype)
       this.formModel.reviewType = reviewType
       this.formModel.reviewSubtype = reviewSubtype
+    },
+    handleGoBack() {
+      this.pageIndex = 0
+      this.formModel = {
+        reviewType: '0',
+        reviewSubtype: '0'
+      }
     }
   }
 }

src/views/review/createReview/reviewData/index.vue

+<template>
+  <div class="review-data">
+    <el-form
+      :model="formModel"
+      :rules="formRules"
+      label-suffix=":"
+      label-width="200px"
+    >
+      <el-form-item label="对应标准" label-width="72px">
+        汽车整车信息安全技术要求
+      </el-form-item>
+      <div class="subtitle">评审对象</div>
+      <el-form-item label="条款分类" prop="tiaokuanfenlei">
+        <el-select v-model="formModel.tiaokuanfenlei" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_scene_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="条款分类" prop="biaozhuntiuaokuan">
+        <el-button type="primary" plain @click="handleReSelect"
+          >重新选择标准条款</el-button
+        >
+        <div style="display: flex">
+          <div>标准要求：</div>
+          <div>
+            5.1 车辆制造商应具备车辆全生命周期的汽车信息安全管理体系。
+            <br />
+            注：车辆全生命周期包括车辆的开发阶段、生产阶段及后生产阶段。
+          </div>
+        </div>
+        <div style="display: flex">
+          <div>审查要求：</div>
+          <div>车辆制造商是否建立汽车信息安全管理制度。</div>
+        </div>
+        <div style="display: flex">
+          <div>审查要求：</div>
+          <div>车辆制造商是否建立汽车信息安全管理制度。</div>
+        </div>
+        <div style="display: flex">
+          <div style="flex-shrink: 0">审查细则：</div>
+          <div style="flex-grow: 1">
+            车辆制造商是否能够提供/展示汽车信息安全管理制度文件，制度文件应定义信息安全政策以及信息安全规则和流程，信息安全政策应致力于管理与车辆制造商活动相关的信息安全风险。
+          </div>
+        </div>
+        <div style="display: flex">
+          <div>审查场景：</div>
+          <div>
+            <audio ref="audio" controls>
+              <source src="/test.mp3" />
+            </audio>
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item label="审查要点" prop="shenchayaodian">
+        <el-input
+          v-model="formModel.shenchayaodian"
+          type="textarea"
+          placeholder="请输入审查要点"
+          maxlength="100"
+          show-word-limit
+          :autosize="{ minRows: 6, maxRows: 6 }"
+          style="width: 350px"
+        >
+        </el-input>
+      </el-form-item>
+      <el-form-item label="审查细则" prop="shenchaxize">
+        <el-input
+          v-model="formModel.shenchaxize"
+          type="textarea"
+          placeholder="请输入审查细则"
+          maxlength="100"
+          show-word-limit
+          :autosize="{ minRows: 6, maxRows: 6 }"
+          style="width: 350px"
+        >
+        </el-input>
+      </el-form-item>
+
+      <div class="subtitle">评审成员</div>
+      <el-form-item label="评审人员">
+        <div>组长-xxx</div>
+        <div>组员-xxx、xxx、xxx</div>
+      </el-form-item>
+      <div class="subtitle">附加信息</div>
+      <el-form-item label="备注信息">
+        <el-input
+          v-model="formModel.beizhuxinxi"
+          type="textarea"
+          placeholder="请输入备注信息"
+          maxlength="100"
+          show-word-limit
+          :autosize="{ minRows: 6, maxRows: 6 }"
+          style="width: 350px"
+        >
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <div class="create-review-footer">
+      <el-button type="primary" class="next-button" @click="handleConfirm"
+        >确认发起</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewData',
+  dicts: ['sys_scene_type'],
+  props: {
+    formModel: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      formRules: {
+        tiaokuanfenlei: [
+          { required: true, message: '请选择条款分类', trigger: 'blur' }
+        ],
+        biaozhuntiuaokuan: [
+          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        ],
+        shenchayaodian: [
+          { required: true, message: '请输入审查要点', trigger: 'blur' }
+        ],
+        shenchaxize: [
+          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    // 按钮-重新选择标准条款
+    handleReSelect() {},
+    // 按钮-确认发起
+    handleConfirm() {
+      console.log('this.value = ', this.formModel)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.review-data {
+  .create-review-footer {
+    margin-top: 50px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    .next-button {
+      width: 150px;
+    }
+  }
+}
+</style>

src/views/review/initiatedReview/index.vue

@@ -156,8 +156,7 @@
           <el-button
             v-hasPermi="['review:initiatedReview:view']"
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="primary"
             plain
             @click="handleView(scope.row)"
             >查看</el-button
@@ -165,8 +164,7 @@
           <el-button
             v-hasPermi="['review:initiatedReview:urgentProcessing']"
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="primary"
             plain
             @click="handleUrgentProcessing(scope.row)"
             >催办</el-button
@@ -174,8 +172,7 @@
           <el-button
             v-hasPermi="['review:initiatedReview:cancel']"
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="primary"
             plain
             @click="handleCancel(scope.row)"
             >取消</el-button
@@ -184,8 +181,7 @@
             v-if="scope.row.type === '3'"
             v-hasPermi="['review:initiatedReview:delete']"
             size="mini"
-            type="danger"
-            icon="el-icon-delete"
+            type="primary"
             plain
             @click="handleDelete(scope.row)"
             >删除</el-button
@@ -219,7 +215,7 @@ export default {
         ask: '1'
       },
       // 列表-数据
-      tableData: []
+      tableData: [{}]
     }
   },
   created() {},

src/views/review/wait/index.vue

@@ -2,9 +2,9 @@
   <div>
     <page-standard>
       <!--1-抬头标题-->
-      <div class="title-style">
-        <div class="title-content-style">我的待审</div>
-      </div>
+      <!--      <div class="title-style">-->
+      <!--        <div class="title-content-style">我的待审</div>-->
+      <!--      </div>-->
       <div class="content-display">
         <el-form
           v-show="showSearch"