首页、分类码、bug修复

src/api/system/role.js

@@ -85,3 +85,12 @@ export const getRoleTree = (tenantId) => {
     }
   })
 }
+
+export const honePageData = () => {
+  return request({
+    url: '/api/daf-system/role/honePageData',
+    method: 'get',
+    params: {}
+  })
+}
+

src/views/leger/equipmentledgerDetail.vue

@@ -60,7 +60,8 @@
                    :upload-before="uploadBefore"
                    :upload-after="uploadAfter"
                    :upload-preview="(file) => handleUploadPreview(file)"
-                   :upload-delete="(file) => handleUploadDelete(file)">
+                   :upload-delete="(file) => handleUploadDelete(file)"
+                   :upload-exceed="uploadExceed">
           <template #accessoryNameExt="scope">
             <el-link type="primary" :underline="false" @click="handleDownload(scope.row)">{{scope.row.prAccessoryName}}</el-link>
           </template>
@@ -880,6 +881,7 @@
         console.log(form)
         document_update(form).then(() => {
           done(form);
+          this.document_onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -987,6 +989,11 @@
       document_onLoad(row, params = {}) {
         this.loading = true;
         document_getListBylegerId(this.$route.query.id).then(res => {
+          for (var index = 0; index < res.data.data.length; index ++) {
+            if (res.data.data[index].prAccessoryName) {
+              res.data.data[index].accessoryNameExt = [{ label: res.data.data[index].prAccessoryName }];
+            }
+          }
           this.document_data = res.data.data;
           this.loading = false;
         });
@@ -1004,6 +1011,7 @@
         }
       },
       uploadAfter(response, done) {
+        console.log(response)
         // response 是服务器响应
         this.document_form.accessoryName = response.fileName;
         this.document_form.prAccessoryName = response.name;
@@ -1014,8 +1022,13 @@
         return false;
       },
       handleUploadDelete(file) {
+        this.document_form.accessoryNameExt = [];
         this.document_form.accessoryName = '';
         this.document_form.prAccessoryName = '';
+      },
+      uploadExceed (limit, files, fileList, column) {
+        console.log(limit, files, fileList, column)
+        this.$message.error('超出上传限制文件数量')
       }
     }
   }

src/views/smart/workorderDetail.vue

@@ -372,6 +372,7 @@
             cancelButtonText: "取消",
             type: "warning"
           }).then(() => {
+            this.tab1_form.approvalStatus = 1;
             add(this.tab1_form).then(() => {
               this.$router.push({
                 path: "/smart/workorder",

src/views/spares/materialclassification.vue

@@ -62,12 +62,12 @@
           searchShowBtn: false,
           column: [
             {
-              label: "物资分配码",
+              label: "物资分类码",
               prop: "code",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入物资分配码",
+                message: "请输入物资分类码",
                 trigger: "blur"
               }]
             },
@@ -75,15 +75,9 @@
               label: "物资类型",
               search: true,
               prop: "type",
-              type: "select",
-              dicUrl: "/api/daf-system/dict/dictionary?code=supplies_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
               rules: [{
                 required: true,
-                message: "请输入物资分配码",
+                message: "请输入物资类型",
                 trigger: "blur"
               }]
             },

src/views/wel/index.vue

@@ -77,47 +77,64 @@
           <div class="notification-container-audit">
             <div class="notification-heading">审核信息</div>
             <p class="notification-title"><i class="el-icon-s-check el-icon-home"></i>  今日待审核</p>
-            <div class="overflowList">
+            <el-skeleton :rows="8" animated v-show="auditSkeleton"/>
-              <el-skeleton :rows="3" animated v-show="skeleton"/>
+            <div class="overflowList" v-show="!auditSkeleton">
+              <el-empty v-if="!homePageData.workOrderAudit
+                            && !homePageData.supplierInfoAudit
+                            && !homePageData.manufacturerInfoAudit
+                            && !homePageData.warehouseAudit
+                            && !homePageData.workPermitAudit
+                            && !homePageData.workOperationTicketAudit
+                            && !homePageData.toolInventoryRecordsAudit
+                            && !homePageData.equipmentLedgerAudit">
+              </el-empty>
               <div class="el-collapse">
-                <div class="el-collapse-item">
+                <div v-show="homePageData.equipmentLedgerAudit || homePageData.toolInventoryRecordsAudit">
-                  <div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
+                  <div class="el-collapse-item">
-                </div>
+                    <div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
-                <div class="el-collapse-item">
+                  </div>
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.equipmentLedgerAudit" :key="index">
-                </div>
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.eqLedgerCode}}号设备台账待审核</span></div>
-                <div class="el-collapse-item">
+                  </div>
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.toolInventoryRecordsAudit" :key="index">
-                </div>
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.toolsCodeId}}号工器具编码待审核</span></div>
-                <br>
+                  </div>
-                <div class="el-collapse-item">
-                  <div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
-                </div>
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-                </div>
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-                </div>
-                <br>
-                <div class="el-collapse-item">
-                  <div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
-                </div>
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-                </div>
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
                 </div>
-                <br>
+                <div v-show="homePageData.workOperationTicketAudit || homePageData.workPermitAudit">
-                <div class="el-collapse-item">
+                  <div class="el-collapse-item">
-                  <div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
+                    <div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.workOperationTicketAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.operationTicketNo}}号操作票待审核</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.workPermitAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.workTicketNo}}号工作票待审核</span></div>
+                  </div>
                 </div>
-                <div class="el-collapse-item">
+                <div v-show="homePageData.warehouseAudit || homePageData.manufacturerInfoAudit || homePageData.supplierInfoAudit || homePageData.materialAudit">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+                  <div class="el-collapse-item">
+                    <div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.workOrderAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.code}}号仓库待审核</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.materialAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.materialNo}}号物资待审核</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.manufacturerInfoAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.creditCode}}号制造商待审核</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.supplierInfoAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.creditCode}}号供应商待审核</span></div>
+                  </div>
                 </div>
-                <div class="el-collapse-item">
+                <div v-show="homePageData.workOrderAudit">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+                  <div class="el-collapse-item">
+                    <div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.workOrderAudit" :key="index">
+                    <div class="el-collapse-item__header"><span class="el-collapse-span">{{item.workOrderNo}}号工单待审核</span></div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -137,25 +154,33 @@
   import {mapGetters} from "vuex";
   // import * as echarts from 'echarts';
   // import {dayLineStatistics , activities} from '@/api/desk/dashboard'
+  import {honePageData} from "@/api/system/role";
   export default {
     name: "wel",
     data() {
       return {
-        data:[],
+        homePageData: {},
         skeleton: false,
-        option: {
+        auditSkeleton: false,
-          span:6,
-          data: []
-        },
       };
     },
     computed: {
       ...mapGetters(["userInfo"]),
     },
     mounted() {
-
+      this.onload();
     },
     methods: {
+      onload(){
+        this.auditSkeleton = true;
+        honePageData().then(res => {
+          console.log(res)
+          this.homePageData = res.data.data;
+
+          this.auditSkeleton = false;
+          this.selectionClear();
+        });
+      }
     }
   };
 </script>