Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/car-test/web into developer/gaixiankang

mock/task.js

@@ -49,5 +49,27 @@ module.exports = [
         total: 10
       }
     }
+  },
+  {
+    url: '/company/list',
+    type: 'get',
+    response: config => {
+      const temp = []
+      for (let i = 0; i < 10; i++) {
+        temp.push({
+          companyName: 'xxxxx',
+          address: 'xxxxx',
+          mailCode: 'xxxxx',
+          companyPeople: 'xxxxx',
+          phoneNum: 'xxxxx',
+          createTime: '2020-11-25 23:26:08'
+        })
+      }
+      return {
+        rows: temp,
+        code: 200,
+        total: 10
+      }
+    }
   }
 ]

src/layout/components/Navbar.vue

 <template>
   <div class="navbar">
-    <div><quick-new></quick-new></div>
+    <!-- <div><quick-new></quick-new></div> -->
     <hamburger
       id="hamburger-container"
       :is-active="sidebar.opened"
@@ -50,14 +50,14 @@ import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 
-import QuickNew from '@/components/QuickNew'
+// import QuickNew from '@/components/QuickNew'
 // import MessageWaring from '@/components/MessageWaring'
 export default {
   components: {
     Breadcrumb,
     TopNav,
-    Hamburger,
-    QuickNew
+    Hamburger
+    // QuickNew
     // MessageWaring
   },
   computed: {
@@ -102,7 +102,7 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 80px;
+  height: 50px;
   overflow: hidden;
   position: relative;
   background: #fff;

src/utils/ruoyi.js

@@ -83,7 +83,7 @@ export function selectDictLabel(datas, value) {
   }
   var actions = []
   Object.keys(datas).some(key => {
-    if (datas[key].value === '' + value) {
+    if (datas[key].value == '' + value) {
       actions.push(datas[key].label)
       return true
     }
@@ -108,7 +108,7 @@ export function selectDictLabels(datas, value, separator) {
   Object.keys(value.split(currentSeparator)).some(val => {
     var match = false
     Object.keys(datas).some(key => {
-      if (datas[key].value === '' + temp[val]) {
+      if (datas[key].value == '' + temp[val]) {
         actions.push(datas[key].label + currentSeparator)
         match = true
       }
@@ -138,7 +138,7 @@ export function sprintf(str) {
 
 // 转换字符串，undefined,null等转化为""
 export function parseStrEmpty(str) {
-  if (!str || str === 'undefined' || str === 'null') {
+  if (!str || str == 'undefined' || str == 'null') {
     return ''
   }
   return str
@@ -148,7 +148,7 @@ export function parseStrEmpty(str) {
 export function mergeRecursive(source, target) {
   for (var p in target) {
     try {
-      if (target[p].constructor === Object) {
+      if (target[p].constructor == Object) {
         source[p] = mergeRecursive(source[p], target[p])
       } else {
         source[p] = target[p]
@@ -180,7 +180,7 @@ export function handleTree(data, id, parentId, children) {
 
   for (let d of data) {
     let parentId = d[config.parentId]
-    if (childrenListMap[parentId] === null) {
+    if (childrenListMap[parentId] == null) {
       childrenListMap[parentId] = []
     }
     nodeIds[d[config.id]] = d
@@ -189,7 +189,7 @@ export function handleTree(data, id, parentId, children) {
 
   for (let d of data) {
     let parentId = d[config.parentId]
-    if (nodeIds[parentId] === null) {
+    if (nodeIds[parentId] == null) {
       tree.push(d)
     }
   }

src/views/processing/processed-review/index.vue

@@ -103,7 +103,7 @@
           <el-button type="success" @click="handleDetail()"
             >查看审查问卷</el-button
           >
-          <el-button type="success">查看审查报告</el-button>
+          <el-button type="success" @click="goReport()">查看审查报告</el-button>
           <el-button type="success">查看企业留档文件</el-button>
           <el-button type="success">查看车企文件库</el-button>
           <el-button v-if="!isSysReview" type="success"
@@ -150,6 +150,9 @@ export default {
     /* 跳转到问卷详情*/
     handleDetail() {
       this.$router.push({ path: '/processing/review-questionnaire' })
+    },
+    goReport() {
+      this.$router.push({ path: '/processing/vehicleEvaluation' })
     }
   }
 }

src/views/processing/vehicleEvaluation/index.vue

+<template>
+  <div class="content">
+    <iframe
+      :src="'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'"
+      frameborder="0"
+      style="width: 100%; height: 100%"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped>
+.content {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+}
+</style>

src/views/review/initiatedReview/viewReview/index.vue

@@ -2,7 +2,7 @@
   <page-standard class="view-review">
     <div slot="tab">
       <div class="view-review-header">
-        <div class="title">
+        <div class="title-content-style">
           {{ $route.meta.title }}
         </div>
         <div class="right-content">
@@ -93,6 +93,12 @@ export default {
   .view-review-header {
     display: flex;
     justify-content: space-between;
+    .title-content-style{
+      width: 60%;
+      margin-bottom: 0px;
+      text-align: left;
+      color: #666666;
+    }
     .right-content {
       .go-back {
         margin-left: 100px;

src/views/setting/company/components/dialog.vue

+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    title="新建"
+    width="1200"
+    append-to-body
+    destroy-on-close
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="form"
+      class="company-form"
+      label-width="120px"
+      label-position="right"
+      :model="model"
+      :rules="rules"
+    >
+      <el-form-item label="企业名称：" prop="companyName">
+        <el-input v-model="model.companyName" placeholder="请输入企业名称" />
+      </el-form-item>
+      <el-form-item label="地址：" prop="address">
+        <el-input
+          v-model="model.address"
+          type="textarea"
+          :rows="4"
+          maxlength="200"
+          show-word-limit
+          placeholder="请输入地址"
+        />
+      </el-form-item>
+      <el-form-item label="邮编：" prop="mailCode">
+        <el-input v-model="model.mailCode" placeholder="请输入邮编" />
+      </el-form-item>
+      <el-form-item label="企业联系人：" prop="companyPeople">
+        <el-input
+          v-model="model.companyPeople"
+          placeholder="请输入企业联系人"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话：" prop="phoneNum">
+        <el-input v-model="model.phoneNum" placeholder="请输入联系电话" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer">
+      <el-button @click="handleClose()"> 取消 </el-button>
+      <el-button type="primary" @click="handleClose()"> 保存 </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: {
+    dialogData: {
+      default: () => {
+        return null
+      },
+      type: Object
+    },
+    dialogVisible: {
+      default: false,
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      model: {},
+      rules: {
+        companyName: [
+          { required: true, message: '请输入企业名称', trigger: 'blur' }
+        ],
+        address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
+        mailCode: [{ required: true, message: '请输入邮编', trigger: 'blur' }],
+        companyPeople: [
+          { required: true, message: '请输入企业联系人', trigger: 'blur' }
+        ],
+        phoneNum: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogData(val) {
+      if (val) {
+        this.model = { ...val }
+      }
+    }
+  },
+  created() {},
+  methods: {
+    handleClose() {
+      this.model = {}
+      this.$emit('close', '123')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.company-form {
+  width: 80%;
+}
+</style>

src/views/setting/company/index.vue

@@ -7,18 +7,42 @@
       size="small"
       :inline="true"
     >
-      <el-form-item label="部门名称" prop="deptName">
+      <el-form-item label="" prop="deptName">
         <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
+          v-model="queryParams.companyName"
+          placeholder="企业名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="" prop="address">
         <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
+          v-model="queryParams.address"
+          placeholder="地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="mailCode">
+        <el-input
+          v-model="queryParams.mailCode"
+          placeholder="邮编"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="companyPeople">
+        <el-input
+          v-model="queryParams.companyPeople"
+          placeholder="企业联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="phoneNum">
+        <el-input
+          v-model="queryParams.phoneNum"
+          placeholder="联系电话"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -42,11 +66,10 @@
         <el-button
           v-hasPermi="['setting:company:add']"
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
-          >新增</el-button
+          @click="openCompanyDialog"
+          >新建</el-button
         >
       </el-col>
       <right-toolbar
@@ -62,22 +85,32 @@
       :default-sort="{ prop: 'createTime', order: 'descending' }"
       :data="tableData"
     >
-      <el-table-column width="100" label="序号" sortable align="left">
-        <template slot-scope="scope">
-          <span>{{ scope.$index + 1 }}</span>
-        </template>
+      <el-table-column
+        type="index"
+        width="100"
+        label="序号"
+        sortable
+        align="left"
+      >
       </el-table-column>
-      <el-table-column label="字段1" sortable align="left"> </el-table-column>
-      <el-table-column label="车企名称" align="left"> </el-table-column>
-      <el-table-column label="字段2" align="left"> </el-table-column>
-      <el-table-column label="字段3" align="left"> </el-table-column>
-      <el-table-column label="字段4" align="left"> </el-table-column>
-      <el-table-column label="字段5" align="left"> </el-table-column>
-      <el-table-column label="字段3" align="left"> </el-table-column>
-      <el-table-column label="创建时间" align="left" sortable prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
+      <el-table-column
+        label="企业名称"
+        prop="companyName"
+        sortable
+        align="left"
+      >
+      </el-table-column>
+      <el-table-column label="地址" prop="address" align="left">
+      </el-table-column>
+      <el-table-column label="邮编" prop="mailCode" align="left">
+      </el-table-column>
+      <el-table-column label="企业联系人" prop="companyPeople" align="left">
+      </el-table-column>
+      <el-table-column label="联系电话" prop="phoneNum" align="left">
+      </el-table-column>
+      <el-table-column label="创建人员" prop="phoneNum" align="left">
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" align="left" sortable>
       </el-table-column>
       <el-table-column
         label="操作"
@@ -117,21 +150,28 @@
     >
     </pagination>
     <!--<yan-dialog :dialog-manger="dialogManger"></yan-dialog> -->
+    <company-dialog
+      :dialog-visible="dialogVisible"
+      :dialog-data="dialogData"
+      @close="closeDialog"
+    ></company-dialog>
   </page-standard>
 </template>
 <script>
 import page from '@/mixins/page'
-// import dialog from './components/dialog.vue'
+import companyDialog from './components/dialog.vue'
 export default {
   components: {
-    // 'yan-dialog': dialog
+    companyDialog
   },
   mixins: [page],
   data() {
     return {
-      listUrl: '/system/role/list',
+      dialogVisible: false,
+      listUrl: '/company/list',
       showSearch: true,
       tableData: [],
+      dialogData: null,
       dialogManger: {
         dialogVisible: false,
         refreshList: false,
@@ -148,14 +188,28 @@ export default {
     }
   },
   methods: {
-    handleAdd() {
-      this.dialogManger.dialogVisible = true
-      this.dialogManger.source = {}
+    closeDialog() {
+      this.dialogVisible = false
+      this.dialogData = null
+    },
+    // 打开企业弹窗
+    openCompanyDialog() {
+      this.dialogVisible = true
+    },
+    handleDelete() {
+      this.$modal
+        .confirm('是否确定删除客户')
+        .then(function () {
+          console.log('123')
+        })
+        .then(() => {
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
     },
-    handleDelete() {},
     handleUpdate(row) {
-      this.dialogManger.dialogVisible = true
-      this.dialogManger.source = row
+      this.dialogVisible = true
+      this.dialogData = row
     }
   }
 }

src/views/setting/rules/index.vue

@@ -111,25 +111,25 @@
           class="item"
           effect="dark"
           :content="node.label"
-          placement="bottom"
+          placement="bottom-start"
         >
           <div class="title">{{ node.label }}</div>
         </el-tooltip>
 
         <div class="buttons-list">
-          <el-button
+          <!-- <el-button
             v-if="node.level == 1"
             type="text"
             size="mini"
             @click="() => append(data)"
           >
             添加标准要求
-          </el-button>
+          </el-button> -->
           <el-button
             v-if="node.level == 2"
             type="text"
             size="mini"
-            @click="() => append(data)"
+            @click="handlePointAdd"
           >
             添加审查要点
           </el-button>
@@ -137,19 +137,19 @@
             v-if="node.level == 3"
             type="text"
             size="mini"
-            @click="() => append(data)"
+            @click="handleAdd"
           >
             添加审查细则
           </el-button>
-          <el-button
+          <!-- <el-button
             v-if="node.level == 4"
             type="text"
             size="mini"
             @click="() => append(data)"
           >
             添加关联场景
-          </el-button>
-          <el-button type="text" size="mini" @click="() => append(data)">
+          </el-button> -->
+          <el-button type="text" size="mini" @click="() => handleUpdate(data)">
             修改
           </el-button>
           <el-button

src/views/setting/standard/index.vue

 <template>
   <page-standard>
     <div slot="tab">
-      <el-radio-group v-model="queryParams.type">
+      <el-radio-group v-model="queryParams.type" @input="loadData">
         <el-radio-button
           v-for="dict in dict.type.sys_detailed_classification"
           :key="dict.value"
@@ -226,7 +226,7 @@ export default {
       showSearch: true,
       list: [],
       tableData: [],
-      queryParams: { type: '2' },
+      queryParams: { type: '1' },
       dialogManger: {
         dialogVisible: false,
         refreshList: false,
@@ -244,8 +244,10 @@ export default {
     }
   },
   methods: {
+    objectSpanMethod() {},
     loadData() {
       this.loading = true
+      console.log(this.queryParams)
       request({
         url: this.listUrl,
         method: 'get',
@@ -253,10 +255,9 @@ export default {
       })
         .then(res => {
           if (res.code === 200) {
+            console.log(res.rows)
             this.list = res.rows
-            console.log(2222)
             if (this.queryParams.type === '2') {
-              console.log(geSpanList(res.rows, ['way', 'object', 'scene']))
               this.tableData = geSpanList(res.rows, ['way', 'object', 'scene'])
             } else {
               this.tableData = res.rows

src/views/task/archived/components/systemReview.vue

@@ -63,9 +63,21 @@
           <span>{{ parseTime(row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="任务编号" align="left" prop="createTime" />
-      <el-table-column label="任务名称" align="left" prop="createTime" />
-      <el-table-column label="任务组长" align="left" prop="createTime" />
+      <el-table-column label="任务编号" align="left" prop="createTime" >
+        <template slot-scope="scope">
+          1010202121
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" align="left" prop="createTime" >
+        <template slot-scope="scope">
+          一汽丰田体系审查
+        </template>
+      </el-table-column>
+      <el-table-column label="任务组长" align="left" prop="createTime">
+        <template slot-scope="scope">
+          赵小刚
+        </template>
+      </el-table-column>
       <el-table-column label="任务状态" align="left" width="210" prop="status">
         <template slot-scope="scope">
           <div class="task-status" @click="handleNotStarted(scope)">

src/views/task/archived/components/vehicleModelEvaluation.vue

@@ -63,9 +63,21 @@
           <span>{{ parseTime(row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="任务编号" align="left" prop="createTime" />
-      <el-table-column label="任务名称" align="left" prop="createTime" />
-      <el-table-column label="任务组长" align="left" prop="createTime" />
+      <el-table-column label="任务编号" align="left" prop="createTime" >
+        <template slot-scope="scope">
+          1010202121
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" align="left" prop="createTime" >
+        <template slot-scope="scope">
+          一汽丰田体系审查
+        </template>
+      </el-table-column>
+      <el-table-column label="任务组长" align="left" prop="createTime">
+        <template slot-scope="scope">
+          赵小刚
+        </template>
+      </el-table-column>
       <el-table-column label="任务状态" align="left" width="210" prop="status">
         <template slot-scope="scope">
           <div class="task-status" @click="handleNotStarted(scope)">