Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/basicdata/basicdataVehicle.js

@@ -77,7 +77,6 @@ export const getVehicleList = () => {
   })
 
 
-
 }
 
 //导出

src/css/common.css

@@ -74,7 +74,7 @@ a {
 
 .avue-view {
   width: 100%;
-  box-sizing: border-box;
+  box-sizing: border-box;           
 }
 
 .avue-footer {

src/styles/common.scss

@@ -101,6 +101,7 @@ a {
   flex: 1;
   overflow-y: auto;
   overflow-x: hidden;
+  background-color: #fff;
 }
 
 .avue-view {

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1,5 +1,6 @@
 <template>
   <div  v-loading="Addloading"
+  class="page_loading"
     element-loading-text="Loading...">
   <el-card class="box-card"    >
     <el-tabs type="border-card" class="topClass" @tab-change="TopChange">
@@ -278,7 +279,7 @@
         <el-input
           v-model="Indexform.typeServiceName"
           disabled
-          placeholder="合作模式(自动带出)"
+          placeholder="合作模式(存在则自动带出)"
           clearable
         />
       </el-form-item>
@@ -423,7 +424,7 @@
                   </el-form-item>
                 </div>
               </div>
-              <div class="el-btn">
+              <div class="el-btn el_btn_remove">
                 <el-button type="primary" @click="ResponsibilityRemoval(index)"> 移除 </el-button>
               </div>
             </div>
@@ -523,7 +524,7 @@
       </el-dialog>
     </div>
 
-    <div class="dialog-footer">
+    <div class="dialog-footer footer_el">
       <el-button @click="Indexdialog = false">取消</el-button>
       <el-button type="primary" @click="ConfirmForm"> 提交 </el-button>
     </div>
@@ -1065,6 +1066,7 @@ const ResponsibilityRemoval = val => {
 };
 // 顶部标签切换
 const TopChange = val => {
+  SelectType.value=null;//重置照片类型
   PackageInfo.value = [
     {
       packageCode: '',
@@ -1833,6 +1835,7 @@ const isShowFormItem2 = computed(() => {
   }
 }
 .dialog-footer {
+  margin-top: 10px;
   width: 100%;
   display: flex;
   justify-content: flex-end;
@@ -2024,7 +2027,7 @@ const isShowFormItem2 = computed(() => {
   padding-left: 10px;
 }
 :deep(.el-card__body) {
-  margin-bottom: 50px;
+  // margin-bottom: 50px;
 }
 :deep(.el-upload-dragger) {
   display: flex;
@@ -2163,5 +2166,18 @@ const isShowFormItem2 = computed(() => {
 :deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before){
   color: #ff0000;
 }
+.footer_el{
+  padding-right: 0;
+  padding: 0;
+}
+:deep(#avue-view){
+  background-color: #fff !important;
+}
+.page_loading{
+  height: 100%;
 
+}
+.el_btn_remove{
+  padding-top: 6px;
+}
 </style>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -776,7 +776,7 @@
                     v-model="Msgtextarea"
                     :rows="5"
                     type="textarea"
-                    placeholder="回复内容"
+                    placeholder="请输入要回复的内容"
                     @input="appoint(Msgtextarea)"
                   />
                   <div class="msgHf">
@@ -2139,7 +2139,7 @@ const submit = async val => {
       .catch(() => {
         ElMessage({
           type: 'info',
-          message: 'Delete canceled',
+          message: '取消操作',
         });
       });
   }
@@ -2935,4 +2935,7 @@ const CustomerServiceCompleted = () => {
   align-items: center;
   justify-content: space-between;
 }
+:deep(.el-upload){
+  display: none;
+}
 </style>

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -1013,6 +1013,7 @@ export default {
       );
     },
     editDeline(row) {
+      console.log('触发了编辑');
       console.log('row>>>>>>>>>>>>>>>', row);
       console.log('this.dicDatas>>>>>>>>>>>>>>>', this.dicDatas);
       this.vehicleformdata = row;

src/views/basicdata/vehicle/basicdataVehicleform.vue

@@ -211,7 +211,7 @@ export default {
             width: '100px',
             align: 'center',
             span: 6,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=From_isHead_yes_no',
             props: {
               label: 'dictValue',
               value: 'dictKey',
@@ -441,12 +441,23 @@ export default {
             align: 'center',
             span: 6,
           },
+          // {
+          //   label: '到期时间',
+          //   prop: 'expirationTime',
+          //   type: 'input',
+          //   labelWidth: '150',
+          //   width: '100px',
+          //   align: 'center',
+          //   span: 6,
+          // },
           {
             label: '到期时间',
             prop: 'expirationTime',
-            type: 'input',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
             labelWidth: '150',
-            width: '100px',
+            width: '180px',
             align: 'center',
             span: 6,
           },
@@ -532,15 +543,28 @@ export default {
             labelWidth: '150',
             span: 6,
           },
+          // {
+          //   label: '车辆年审有效期',
+          //   prop: 'reviewValidity',
+          //   type: 'input',
+          //   labelWidth: '150',
+          //   width: '150px',
+          //   align: 'center',
+          //   span: 6,
+          // },
           {
             label: '车辆年审有效期',
             prop: 'reviewValidity',
-            type: 'input',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
             labelWidth: '150',
-            width: '150px',
+            width: '180px',
             align: 'center',
             span: 6,
           },
+
+
           {
             label: '车辆保险开始时间',
             prop: 'insuranceStartTime',
@@ -571,7 +595,7 @@ export default {
             width: '150px',
             align: 'center',
             span: 6,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=bodyAdvertising_From_yes_no',
             props: {
               label: 'dictValue',
               value: 'dictKey',

src/views/supervise/classify.vue

@@ -20,13 +20,16 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddCategory">
+            <el-button type="primary" @click="AddCategory" v-if="PermissionButton.classify_add">
               <el-icon><Plus /></el-icon>新 增</el-button
             >
 
-            <el-button type="primary" @click="BatchDelete" icon="Delete">
+            <el-button type="primary" @click="BatchDelete" icon="Delete" v-if="PermissionButton.classify_delete">
              批量删除</el-button
             >
+            <el-button class="el_view" type="primary" @click="BatchDelete"  v-if="PermissionButton.classify_view">
+             查看</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -153,6 +156,18 @@ const  columnList = ref([]); //列表配置
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
+const $useStore = useStore();
+const accessControl = $useStore.getters.permission;
+
+
+const PermissionButton = computed(() => {
+  return {
+    classify_add: accessControl.classify_add, //新增
+    classify_delete:accessControl.classify_delete, //删除
+    classify_view:accessControl.classify_view, //查看
+  };
+});
+console.log(accessControl,'角色权限');
 const onLoad = () => {
   let data = {
     current: current.value,
@@ -371,4 +386,7 @@ function ProhibitSelection(val,index){
 .maboxhi {
   height: 700px !important;
 }
+.el_view{
+  display: none;
+}
 </style>

src/views/supervise/management.vue

@@ -73,17 +73,19 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddCategory">
+            <el-button type="primary" @click="AddCategory" v-if="PermissionButton.Classification_add">
               <el-icon><Plus /></el-icon>新 增</el-button
             >
-
-            <el-button type="primary" @click="BatchDelete" icon="Delete">
+            <el-button type="primary" @click="BatchDelete" icon="Delete" v-if="PermissionButton.Category_deletion">
             批量删除</el-button
             >
 
-            <el-button type="primary" @click="details.popUpShow.UploadBatch = true" icon="Upload">
+            <el-button type="primary" @click="details.popUpShow.UploadBatch = true" icon="Upload" v-if="PermissionButton.Classification_import">
               导入
             </el-button>
+            <el-button type="primary"   v-if="PermissionButton.Category_View" class="el_view">
+              查看
+            </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -270,6 +272,7 @@ import { ref, reactive, computed, onMounted } from 'vue';
 import { managementColumnList } from '@/option/supervise/supervise.js';
 import functions from '@/utils/functions.js';
 import { getToken } from '@/utils/auth';
+import { useRouter } from 'vue-router';
 import {
   $_Getclassify,
   $_newlyadded,
@@ -281,6 +284,9 @@ import {
 } from '@/api/classify/classify';
 import { isNumber, setNodeHeight } from '@/utils/util';
 const loadingclassification = ref(false); //指标分类加载效果
+const $useStore = useStore();
+const accessControl = $useStore.getters.permission;
+console.log(accessControl,'按钮权限');
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
 const total = ref(0); //总页数
@@ -314,6 +320,14 @@ departmentNameTemp.value = my_DATA.departmentName; //归属名称
 departmentNameID.value = my_DATA.department; //归属名称ID
 console.log(departmentName.value, '归属名称');
 console.log(departmentNameID.value, '归属名称ID');
+const PermissionButton = computed(() => {
+  return {
+    Classification_add: accessControl.Classification_add, //新增
+    Category_deletion:accessControl.Category_deletion, //删除
+    Classification_import:accessControl.Classification_import, //导入
+    Category_View:accessControl.Category_View, //查看
+  };
+});
 // 获取分类指标
 // 在外部定义递归函数，用于加载和更新分类
 const loadChildren = (targetList, parentId, indicatorValue) => {
@@ -884,4 +898,7 @@ const handleClose = res => {
 // .maboxhi {
 //   height: 700px !important;
 // }
+.el_view{
+  display: none;
+}
 </style>