bug 修复

src/permission.js

@@ -52,7 +52,8 @@ router.beforeEach((to, from, next) => {
     } else {
       const redirectUrl =
         process.env.NODE_ENV === "production" ? "/iws/glweb/login" : "/login";
-      next(`${redirectUrl}?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      // next(`${redirectUrl}?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      next(redirectUrl)
       NProgress.done(true);
     }
   }

src/views/EquipmentEntryApply/EquipmentMainList.vue

@@ -40,6 +40,7 @@
             >
               <el-option label="待审批" value="0"/>
               <el-option label="已审批" value="1"/>
+              <el-option label="草稿" value="3"/>
             </el-select>
           </el-form-item>
 

src/views/EquipmentLedger/index.vue

@@ -1279,6 +1279,7 @@ export default {
           devIds: this.selectedRows.map((item) => item.maId).join(','),
           status: 1,
         })
+        this.selectedRows = []
 
         if (res.code === 200) {
           this.$message.success('装备上架成功')
@@ -1306,6 +1307,7 @@ export default {
           devIds: this.selectedRows.map((item) => item.maId).join(','),
           status: 0,
         })
+        this.selectedRows = []
 
         if (res.code === 200) {
           this.$message.success('装备下架成功')

src/views/EquipmentServicing/index.vue

@@ -127,6 +127,7 @@
       <!-- 新增质检表单 -->
       <template v-if="dialogTitle === '质检新增'">
         <el-form
+          v-if="addOrEditDialogVisible"
           ref="addOrEditFormRef"
           :model="addOrEditForm"
           :rules="addOrEditFormRules"
@@ -563,6 +564,13 @@ export default {
     handleOpenDetailDialog(row) {
       this.qualityDetails = row
       this.searchParamsInDialog.maId = row.maId
+      this.searchParamsInDialog.qcCode = ''
+      this.qcTime_1 = []
+      this.createTime_1 = []
+      this.searchParamsInDialog.qcStartTime = ''
+      this.searchParamsInDialog.qcEndTime = ''
+      this.searchParamsInDialog.createStartTime = ''
+      this.searchParamsInDialog.createEndTime = ''
       this.dialogTitle = '质检记录'
       this.addOrEditDialogVisible = true
       this.getLeaseListDataInDialog()
@@ -669,7 +677,7 @@ export default {
         this.$message.success('文件上传成功')
         // 按后端返回格式调整文件信息
         let fileUrl = ''
-        if (process.env.VUE_APP_BASE_API === '/proxyApi') {
+        if (process.env.VUE_APP_BASE_API !== '/iws/jxhzb-api') {
           fileUrl = response.data.url // 公司-测试环境
         } else {
           fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + response.data.url // 宏源-测试环境

src/views/address-manage/index.vue

@@ -134,6 +134,7 @@
                 clearable
                 placeholder="请输入详细地址"
                 v-model="addOrEditForm.address"
+                :maxlength="99"
               />
             </el-form-item>
           </el-col>

src/views/contract-manage/index.vue

@@ -163,27 +163,14 @@
           <el-col :span="24">
             <el-form-item label="附件" prop="fileInfoList">
               <div style="flex: 1">
-                <UploadComponentNewTwo
+                <FileUpload
-                  :maxSize="2"
+                  v-model="addAndEditForm.fileInfoList"
-                  :max-limit="1"
+                  :value="addAndEditForm.fileInfoList"
-                  width="100%"
+                  :limit="1"
-                  height="100%"
+                  :fileSize="2"
-                  :multiple="true"
+                  :fileType="['doc', 'docx']"
-                  :autoUpload="true"
+                  @input="handleFileUploadChange"
-                  :minLimit="addAndEditForm.fileInfoList.length"
+                />
-                  :actionUrl="uploadUrl"
-                  listType="text"
-                  :justifyContent="`flex-start`"
-                  @onFileChange="onFileChange"
-                  :acceptTypeList="['.doc', '.docx']"
-                >
-                  <template slot="default">
-                    <el-button
-                      type="primary"
-                      class="primary-lease"
-                    >上传文件</el-button>
-                  </template>
-                </UploadComponentNewTwo>
               </div>
             </el-form-item>
           </el-col>
@@ -209,6 +196,7 @@ import {
   delContractApi,
   updateStatus
 } from '@/api/contract-manage/index'
+import FileUpload from '@/components/ImageUpload'
 
 export default {
   data() {
@@ -326,6 +314,22 @@ export default {
       this.addAndEditForm.id = ''
       this.addAndEditForm.contractName = ''
     },
+    handleFileUploadChange(files) {
+      if (!files) {
+        this.addAndEditForm.fileInfoTempList = []
+      } else {
+        const arr = files.split(',')
+        this.addAndEditForm.fileInfoTempList = arr.map((item) => {
+          const parts = item.split('/')
+          return {
+            fileName: parts[parts.length - 1],
+            fileUrl: item,
+          }
+        })
+      }
+      console.log('🚀 ~ file:', this.addAndEditForm.fileInfoTempList)
+      this.$refs.addAndEditFormRef.validateField('fileInfoList')
+    },
 
     // 文件上传变更
     onFileChange(fileList) {

src/views/material/ma/supplier/index.vue

@@ -94,7 +94,7 @@
         <el-table-column label="厂家名称" align="center" prop="supplierName" sortable/>
         <el-table-column label="联系人" align="center" prop="contactPerson" sortable/>
         <el-table-column label="联系电话" align="center" prop="contactPhone" sortable/>
-        <el-table-column label="地址" align="center" prop="address" sortable/>
+        <el-table-column label="地址" align="center" prop="address" sortable show-overflow-tooltip/>
         <el-table-column label="资质/执照编号" align="center" prop="qualification" sortable/>
         <el-table-column label="状态" align="center" prop="status" width="100">
           <template slot-scope="{ row }">