Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

.cspell/custom-words.txt

@@ -66,4 +66,8 @@ vnodes
 nums
 assigin
 metas
-rachange
\ No newline at end of file
+rachange
+chexing
+wendang
+Chexingdialog
+Wendangdialog
\ No newline at end of file

mock/setting.js

@@ -95,9 +95,11 @@ module.exports = [
   },
   {
     url: '/rules-list',
-    type: 'get',
+    type: 'post',
     response: config => {
-      const query = config.query
+      const query = config.body
+      console.log('config');
+      console.log(config);
       let temp = []
       if (query.type === '1' || query.type === '2') {
         temp = [

src/views/setting/rules/components/Chexingdialog.vue

@@ -53,12 +53,20 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="关联场景" prop="status">
+      <el-form-item label="关联场景">
         <br />
-        <template v-for="(item, key) in model.scene">
-          <el-row :key="key" class="mb10" :gutter="20">
-            <el-col :span="22">
-              <el-input v-model="model.text" placeholder="请输入" clearable />
+        <div v-for="(item, key) in model.scene" :key="key">
+          <el-row class="mb10" :gutter="20">
+            <el-col :span="22" class="mt10">
+              <el-form-item
+                label=""
+                :prop="'scene.' + key + '.text'"
+                :rules="[
+                  { required: true, message: '请输入', trigger: 'blur' }
+                ]"
+              >
+                <el-input v-model="item.text" placeholder="请输入" clearable />
+              </el-form-item>
             </el-col>
             <el-col :span="2">
               <template v-if="key === 0">
@@ -69,17 +77,9 @@
               </template>
             </el-col>
           </el-row>
-        </template>
+        </div>
       </el-form-item>
     </el-form>
-    <detail-select
-      :dialog-manger="detailManger"
-      @close="detailManger.dialogVisible = false"
-    ></detail-select>
-    <point-select
-      :dialog-manger="pointManger"
-      @close="pointManger.dialogVisible = false"
-    ></point-select>
     <div slot="footer">
       <el-button @click="handleClose()"> 取消 </el-button>
       <el-button type="primary" @click="handleConfirm()"> 保存 </el-button>
@@ -94,7 +94,7 @@ export default {
       default() {
         return {
           dialogVisible: false,
-          source: {}
+          dialogEditId: null
         }
       }
     }
@@ -109,11 +109,6 @@ export default {
           }
         ]
       },
-      sceneManger: {
-        dialogVisible: false,
-        refreshList: false,
-        source: {}
-      },
       rules: {
         status: [
           { required: true, message: '菜单名称不能为空', trigger: 'blur' }
@@ -122,21 +117,13 @@ export default {
           { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
         ],
         path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }]
-      },
-      detailManger: {
-        dialogVisible: false,
-        refreshList: false
-      },
-      pointManger: {
-        dialogVisible: false,
-        refreshList: false
       }
     }
   },
 
   computed: {
     modelTitle() {
-      return this.dialogManger.source.id ? '编辑' : '新增' + '审查内容'
+      return this.dialogManger.dialogEditId ? '编辑' : '新增' + '审查内容'
     }
   },
   methods: {
@@ -155,7 +142,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.dialogManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {})
@@ -166,5 +153,6 @@ export default {
 <style scoped>
 .icon {
   font-size: 20px;
+  margin-top: 10px;
 }
 </style>

src/views/setting/rules/components/Wendangdialog.vue

@@ -68,7 +68,7 @@ export default {
       default() {
         return {
           dialogVisible: false,
-          source: {}
+          dialogEditId: null
         }
       }
     }
@@ -110,7 +110,7 @@ export default {
 
   computed: {
     modelTitle() {
-      return this.dialogManger.source.id ? '编辑' : '新增' + '审查内容'
+      return this.dialogManger.dialogEditId ? '编辑' : '新增' + '审查内容'
     }
   },
   methods: {
@@ -129,7 +129,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.detailManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {})

src/views/setting/rules/components/detailSelect.vue

@@ -83,12 +83,11 @@ export default {
       default() {
         return {
           dialogVisible: false,
-          source: {}
+          dialogEditId: null
         }
       }
     }
   },
-  dicts: ['sys_detailed_classification'],
   data() {
     return {
       model: {},
@@ -127,7 +126,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.dialogManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {

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

@@ -60,14 +60,8 @@
         </template>
       </el-form-item>
     </el-form>
-    <detail-select
-      :dialog-manger="detailManger"
-      @close="detailManger.dialogVisible = false"
-    ></detail-select>
-    <point-select
-      :dialog-manger="pointManger"
-      @close="pointManger.dialogVisible = false"
-    ></point-select>
+    <detail-select :dialog-manger="detailManger"></detail-select>
+    <point-select :dialog-manger="pointManger"></point-select>
     <div slot="footer">
       <el-button @click="handleClose()"> 取消 </el-button>
       <el-button type="primary" @click="handleConfirm()"> 保存 </el-button>
@@ -89,7 +83,7 @@ export default {
       default() {
         return {
           dialogVisible: false,
-          source: {}
+          dialogEditId: null
         }
       }
     }
@@ -131,7 +125,7 @@ export default {
 
   computed: {
     modelTitle() {
-      return this.dialogManger.source.id ? '编辑' : '新增' + '审查细则'
+      return this.dialogManger.dialogEditId ? '编辑' : '新增' + '审查细则'
     }
   },
   methods: {
@@ -150,7 +144,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.dialogManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {})

src/views/setting/rules/components/pointDialog.vue

@@ -62,7 +62,7 @@ export default {
       default() {
         return {
           dialogVisible: true,
-          source: {}
+          dialogEditId: null
         }
       }
     }
@@ -100,7 +100,7 @@ export default {
 
   computed: {
     modelTitle() {
-      return this.dialogManger.source.id ? '编辑' : '新增' + '审查要点'
+      return this.dialogManger.dialogEditId ? '编辑' : '新增' + '审查要点'
     }
   },
   methods: {
@@ -116,7 +116,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.dialogManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {

src/views/setting/rules/components/pointSelect.vue

@@ -83,7 +83,7 @@ export default {
       default() {
         return {
           dialogVisible: false,
-          source: {}
+          dialogEditId: null
         }
       }
     }
@@ -127,7 +127,7 @@ export default {
       this.model.scene.splice(key, 1)
     },
     handleClose() {
-      this.$emit('close')
+      this.dialogManger.dialogVisible = false
     },
     handleConfirm() {
       this.$refs['form'].validate(valid => {

src/views/setting/rules/index.vue

@@ -74,28 +74,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb10">
-      <!-- <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['setting:rules:add']"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handlePointAdd"
-          >新增要点</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['setting:rules:add']"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >新增细则</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :show-search.sync="showSearch"
         @queryTable="loadData"
@@ -132,7 +110,7 @@
             v-if="node.level == 1"
             type="text"
             size="mini"
-            @click="handlePointAdd"
+            @click="handlePointUpdate(node.level, 0)"
           >
             添加审查要点
           </el-button>
@@ -140,7 +118,7 @@
             v-if="node.level == 2"
             type="text"
             size="mini"
-            @click="handleAdd"
+            @click="handleUpdate(node.level, 0)"
           >
             添加审查细则
           </el-button>
@@ -152,13 +130,17 @@
           >
             添加关联场景
           </el-button> -->
-          <el-button type="text" size="mini" @click="() => handleUpdate(data)">
+          <el-button
+            type="text"
+            size="mini"
+            @click="() => handleUpdate(node.level, data.id)"
+          >
             修改
           </el-button>
           <el-button
             type="text"
             size="mini"
-            @click="() => handleDelete(node, data)"
+            @click="() => handleDelete(node.level, data)"
           >
             删除
           </el-button>
@@ -252,20 +234,19 @@
     </pagination>
     <yan-dialog
       :dialog-manger="dialogManger"
-      @close="dialogManger.dialogVisible = false"
+      @refresh="refreshList = true"
     ></yan-dialog>
-
     <point-dialog
       :dialog-manger="dialogPointManger"
-      @close="dialogPointManger.dialogVisible = false"
+      @refresh="refreshList = true"
     ></point-dialog>
     <chexing-dialog
       :dialog-manger="ChexingdialogManger"
-      @close="ChexingdialogManger.dialogVisible = false"
+      @refresh="refreshList = true"
     ></chexing-dialog>
     <wendang-dialog
       :dialog-manger="WendangdialogManger"
-      @close="WendangdialogManger.dialogVisible = false"
+      @refresh="refreshList = true"
     ></wendang-dialog>
   </page-standard>
 </template>
@@ -297,40 +278,37 @@ export default {
       queryParams: { type: '1' },
       dialogManger: {
         dialogVisible: false,
-        refreshList: false,
-        source: {}
+        parentId: 0,
+        dialogEditId: null
       },
       dialogPointManger: {
         dialogVisible: false,
-        refreshList: false,
-        source: {}
+        parentId: 0,
+        dialogEditId: null
       },
       ChexingdialogManger: {
         dialogVisible: false,
-        refreshList: false,
-        source: {}
+        parentId: 0,
+        dialogEditId: null
       },
       WendangdialogManger: {
         dialogVisible: false,
-        refreshList: false,
-        source: {}
-      }
+        parentId: 0,
+        dialogEditId: null
+      },
+      refreshList: false
     }
   },
   watch: {
-    'dialogManger.refreshList'(val) {
+    refreshList(val) {
       if (val) {
         this.loadData()
-        this.dialogManger.refreshList = false
+        this.refreshList = false
       }
     }
   },
   methods: {
-    handleAdd(type) {
-      this.dialogManger.dialogVisible = true
-      this.dialogManger.source = {}
-    },
-    handlePointAdd() {
+    handlePointUpdate() {
       this.dialogPointManger.dialogVisible = true
       this.dialogPointManger.source = {}
     },
@@ -347,19 +325,19 @@ export default {
         })
         .catch(() => {})
     },
-    handleUpdate(type, row) {
+    handleUpdate(type, id) {
       switch (type) {
         case 1:
           this.dialogManger.dialogVisible = true
-          this.dialogManger.source = row
+          this.dialogManger.dialogEditId = id
           break
         case 2:
           this.ChexingdialogManger.dialogVisible = true
-          this.ChexingdialogManger.source = row
+          this.ChexingdialogManger.dialogEditId = id
           break
         case 3:
           this.WendangdialogManger.dialogVisible = true
-          this.WendangdialogManger.source = row
+          this.WendangdialogManger.dialogEditId = id
           break
       }
     }