Merge remote-tracking branch 'origin/main'

inspur-service/inspur-admin/pom.xml

@@ -8,7 +8,7 @@
         <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>inspur-admin</artifactId>
 
     <description>

inspur-service/inspur-order/src/main/java/com/inspur/order/mapper/OmOrderInfoMapper.java

@@ -117,7 +117,7 @@ public interface OmOrderInfoMapper
      */
     public List<OmOrderInfo> selectInvainOrder();
     /**
-     * 查询无效订单
+     * 批量更新订单状态
      *
      * @return 结果
      */

inspur-service/inspur-order/src/main/resources/mapper/order/OmOrderInfoMapper.xml

@@ -340,6 +340,7 @@
         FROM om_order_quotation q
         LEFT JOIN om_order_info a ON a.order_id = q.order_id
         <where>
+            q.del_flag = '0 '
             <if test="tenantId != null  and tenantId != ''">and q.tenant_id = #{tenantId}</if>
             <if test="status != null  and status != ''">and a.status = #{status}</if>
             <if test="searchValue != null  and searchValue != ''">and q.quotation_num like

inspur-ui/src/views/login.vue

@@ -187,7 +187,7 @@ export default {
     changeLoginStatus() {
       if (this.loginStatus === 0) {
         this.loginStatus = 1;
-        this.title = "装备运维知识服务平台后台";
+        this.title = "装备运维知识服务管理平台";
       } else if (this.loginStatus === 1) {
         this.loginStatus = 0;
         this.title = "装备运维知识服务平台";
@@ -211,7 +211,7 @@ export default {
       const tenantId = Cookies.get("tenantId");
       if (tenantId == "00000000") {
         this.loginStatus = 1;
-        this.title = "装备运维知识服务平台后台";
+        this.title = "装备运维知识服务管理平台";
       } else {
         this.loginStatus = 0;
         this.title = "装备运维知识服务平台";

inspur-ui/src/views/om/application/complianceReview.vue

@@ -417,7 +417,7 @@
             />
           </el-form-item>
         </el-row>
-        <el-row>
+        <el-row v-if="!isDisabled">
           <el-form-item
             label="合规性审查意见"
             prop="complianceReview"
@@ -445,7 +445,14 @@
           type="primary"
           @click="submitForm(4)"
         >驳 回</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button
+          v-if="!isDisabled"
+          @click="cancel"
+        >取 消</el-button>
+        <el-button
+          v-if="isDisabled"
+          @click="cancel"
+        >关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -453,7 +460,7 @@
 
 <script>
 import {
-  listByOmApplication,
+  listApplication,
   getApplication,
   addApplication,
   updateApplication,
@@ -521,7 +528,7 @@ export default {
       // 只查询合规性审核阶段
       this.queryParams.status = "3";
       this.loading = true;
-      listByOmApplication(this.queryParams).then((response) => {
+      listApplication(this.queryParams).then((response) => {
         this.applicationList = response.rows;
         this.total = response.total;
         this.loading = false;

inspur-ui/src/views/om/application/fileUpload.vue

@@ -5,7 +5,6 @@
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
       :limit="limit"
-      accept=".zip,.rar"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
@@ -143,26 +142,26 @@ export default {
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
-      // 校检文件类型
-      if (this.fileType) {
-        const fileName = file.name.split(".");
-        const fileExt = fileName[fileName.length - 1];
-        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
-        if (!isTypeOk) {
-          this.$modal.msgError(
-            `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
-          );
-          return false;
-        }
-      }
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
+      // // 校检文件类型
+      // if (this.fileType) {
+      //   const fileName = file.name.split(".");
+      //   const fileExt = fileName[fileName.length - 1];
+      //   const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+      //   if (!isTypeOk) {
+      //     this.$modal.msgError(
+      //       `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
+      //     );
+      //     return false;
+      //   }
+      // }
+      // // 校检文件大小
+      // if (this.fileSize) {
+      //   const isLt = file.size / 1024 / 1024 < this.fileSize;
+      //   if (!isLt) {
+      //     this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
+      //     return false;
+      //   }
+      // }
       this.$modal.loading("正在上传文件，请稍候...");
       this.number++;
       return true;

inspur-ui/src/views/om/application/infoReview.vue

@@ -405,13 +405,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="!isDisabled">
           <el-form-item
-            :disabled="isDisabled"
             label="资料审查意见"
             prop="infoReview"
           >
             <el-input
+              :disabled="isDisabled"
               v-model="form.infoReview"
               type="textarea"
               placeholder="请输入内容"
@@ -433,7 +433,14 @@
           type="primary"
           @click="submitForm(2)"
         >驳 回</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button
+          v-if="!isDisabled"
+          @click="cancel"
+        >取 消</el-button>
+        <el-button
+          v-if="isDisabled"
+          @click="cancel"
+        >关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -441,7 +448,7 @@
 
 <script>
 import {
-  listByOmApplication,
+  listApplication,
   getApplication,
   addApplication,
   updateApplication,
@@ -509,7 +516,7 @@ export default {
       // 只查询资料审核阶段
       this.queryParams.status = "1";
       this.loading = true;
-      listByOmApplication(this.queryParams).then((response) => {
+      listApplication(this.queryParams).then((response) => {
         this.applicationList = response.rows;
         this.total = response.total;
         this.loading = false;

inspur-ui/src/views/om/application/record.vue

@@ -103,6 +103,23 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+        label="状态"
+        prop="status"
+      >
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.om_application_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -446,7 +463,7 @@
 </template>
 
 <script>
-import { listByOmApplication, getApplication } from "@/api/om/application";
+import { listApplication, getApplication } from "@/api/om/application";
 export default {
   name: "Application",
   dicts: [
@@ -511,7 +528,7 @@ export default {
     /** 查询团队注册申请列表 */
     getList() {
       this.loading = true;
-      listByOmApplication(this.queryParams).then((response) => {
+      listApplication(this.queryParams).then((response) => {
         this.applicationList = response.rows;
         this.total = response.total;
         this.loading = false;

inspur-ui/src/views/om/application/submit.vue

@@ -401,6 +401,7 @@ import {
   addApplication,
   updateApplication,
   uniqueCheck,
+  delApplication,
 } from "@/api/om/application";
 import FileUploadOm from "@/views/om/application/fileUpload";
 export default {
@@ -654,6 +655,21 @@ export default {
         "_self"
       );
     },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const teamId = row.id;
+      const teamName = row.teamName;
+      this.$modal
+        .confirm('是否确认删除名称为"' + teamName + '"运维团队申请？')
+        .then(function () {
+          return delApplication(teamId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
   },
 };
 </script>

inspur-ui/src/views/om/teamInfo/index.vue

@@ -492,9 +492,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const teamIds = row.teamId || this.ids;
+      const teamIds = row.teamId;
       this.$modal
-        .confirm('是否确认删除运维团队:"' + teamIds + '"？')
+        .confirm('是否确认删除运维团队:"' + row.teamName + '"？')
         .then(function () {
           return delTeamInfo(teamIds);
         })

inspur-ui/src/views/order/collect/index.vue

@@ -680,9 +680,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/dispatch/index.vue

@@ -632,9 +632,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/follow/index.vue

@@ -653,10 +653,12 @@
               label="备注"
               prop="remark"
             >
-              <el-input
+            <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/info/index.vue

@@ -716,9 +716,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/my/index.vue

@@ -589,9 +589,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/push/index.vue

@@ -696,9 +696,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/quotation/index.vue

@@ -668,9 +668,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

inspur-ui/src/views/order/record/index.vue

@@ -675,9 +675,11 @@
               prop="remark"
             >
               <el-input
+                v-if="!isView"
                 v-model="formQuotation.remark"
                 placeholder="请输入备注"
               />
+              <span v-if="isView">{{ formQuotation.remark }}</span>
             </el-form-item>
           </el-col>
         </el-row>