Compare commits
No commits in common. "ad9d2e0c1177d840757f7f4fc98917bb7abd01d1" and "c1a5f98a9c2013b0ce0023066362ede3dd558c79" have entirely different histories.
ad9d2e0c11
...
c1a5f98a9c
@ -8,7 +8,7 @@
|
||||
<version>3.8.7</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>war</packaging>
|
||||
<packaging>jar</packaging>
|
||||
<artifactId>inspur-admin</artifactId>
|
||||
|
||||
<description>
|
||||
|
||||
@ -117,7 +117,7 @@ public interface OmOrderInfoMapper
|
||||
*/
|
||||
public List<OmOrderInfo> selectInvainOrder();
|
||||
/**
|
||||
* 批量更新订单状态
|
||||
* 查询无效订单
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
|
||||
@ -340,7 +340,6 @@
|
||||
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
|
||||
|
||||
@ -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 = "装备运维知识服务平台";
|
||||
|
||||
@ -417,7 +417,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row v-if="!isDisabled">
|
||||
<el-row>
|
||||
<el-form-item
|
||||
label="合规性审查意见"
|
||||
prop="complianceReview"
|
||||
@ -445,14 +445,7 @@
|
||||
type="primary"
|
||||
@click="submitForm(4)"
|
||||
>驳 回</el-button>
|
||||
<el-button
|
||||
v-if="!isDisabled"
|
||||
@click="cancel"
|
||||
>取 消</el-button>
|
||||
<el-button
|
||||
v-if="isDisabled"
|
||||
@click="cancel"
|
||||
>关 闭</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@ -460,7 +453,7 @@
|
||||
|
||||
<script>
|
||||
import {
|
||||
listApplication,
|
||||
listByOmApplication,
|
||||
getApplication,
|
||||
addApplication,
|
||||
updateApplication,
|
||||
@ -528,7 +521,7 @@ export default {
|
||||
// 只查询合规性审核阶段
|
||||
this.queryParams.status = "3";
|
||||
this.loading = true;
|
||||
listApplication(this.queryParams).then((response) => {
|
||||
listByOmApplication(this.queryParams).then((response) => {
|
||||
this.applicationList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
:before-upload="handleBeforeUpload"
|
||||
:file-list="fileList"
|
||||
:limit="limit"
|
||||
accept=".zip,.rar"
|
||||
:on-error="handleUploadError"
|
||||
:on-exceed="handleExceed"
|
||||
:on-success="handleUploadSuccess"
|
||||
@ -142,26 +143,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;
|
||||
|
||||
@ -405,13 +405,13 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-if="!isDisabled">
|
||||
<el-row>
|
||||
<el-form-item
|
||||
:disabled="isDisabled"
|
||||
label="资料审查意见"
|
||||
prop="infoReview"
|
||||
>
|
||||
<el-input
|
||||
:disabled="isDisabled"
|
||||
v-model="form.infoReview"
|
||||
type="textarea"
|
||||
placeholder="请输入内容"
|
||||
@ -433,14 +433,7 @@
|
||||
type="primary"
|
||||
@click="submitForm(2)"
|
||||
>驳 回</el-button>
|
||||
<el-button
|
||||
v-if="!isDisabled"
|
||||
@click="cancel"
|
||||
>取 消</el-button>
|
||||
<el-button
|
||||
v-if="isDisabled"
|
||||
@click="cancel"
|
||||
>关 闭</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@ -448,7 +441,7 @@
|
||||
|
||||
<script>
|
||||
import {
|
||||
listApplication,
|
||||
listByOmApplication,
|
||||
getApplication,
|
||||
addApplication,
|
||||
updateApplication,
|
||||
@ -516,7 +509,7 @@ export default {
|
||||
// 只查询资料审核阶段
|
||||
this.queryParams.status = "1";
|
||||
this.loading = true;
|
||||
listApplication(this.queryParams).then((response) => {
|
||||
listByOmApplication(this.queryParams).then((response) => {
|
||||
this.applicationList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
||||
@ -103,23 +103,6 @@
|
||||
/>
|
||||
</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"
|
||||
@ -463,7 +446,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listApplication, getApplication } from "@/api/om/application";
|
||||
import { listByOmApplication, getApplication } from "@/api/om/application";
|
||||
export default {
|
||||
name: "Application",
|
||||
dicts: [
|
||||
@ -528,7 +511,7 @@ export default {
|
||||
/** 查询团队注册申请列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listApplication(this.queryParams).then((response) => {
|
||||
listByOmApplication(this.queryParams).then((response) => {
|
||||
this.applicationList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
||||
@ -401,7 +401,6 @@ import {
|
||||
addApplication,
|
||||
updateApplication,
|
||||
uniqueCheck,
|
||||
delApplication,
|
||||
} from "@/api/om/application";
|
||||
import FileUploadOm from "@/views/om/application/fileUpload";
|
||||
export default {
|
||||
@ -655,21 +654,6 @@ 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>
|
||||
|
||||
@ -492,9 +492,9 @@ export default {
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const teamIds = row.teamId;
|
||||
const teamIds = row.teamId || this.ids;
|
||||
this.$modal
|
||||
.confirm('是否确认删除运维团队:"' + row.teamName + '"？')
|
||||
.confirm('是否确认删除运维团队:"' + teamIds + '"？')
|
||||
.then(function () {
|
||||
return delTeamInfo(teamIds);
|
||||
})
|
||||
|
||||
@ -680,11 +680,9 @@
|
||||
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>
|
||||
|
||||
@ -632,11 +632,9 @@
|
||||
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>
|
||||
|
||||
@ -653,12 +653,10 @@
|
||||
label="备注"
|
||||
prop="remark"
|
||||
>
|
||||
<el-input
|
||||
v-if="!isView"
|
||||
<el-input
|
||||
v-model="formQuotation.remark"
|
||||
placeholder="请输入备注"
|
||||
/>
|
||||
<span v-if="isView">{{ formQuotation.remark }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
@ -716,11 +716,9 @@
|
||||
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>
|
||||
|
||||
@ -589,11 +589,9 @@
|
||||
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>
|
||||
|
||||
@ -696,11 +696,9 @@
|
||||
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>
|
||||
|
||||
@ -668,11 +668,9 @@
|
||||
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>
|
||||
|
||||
@ -675,11 +675,9 @@
|
||||
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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user