bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改

This commit is contained in:
BianLzhaoMin 2024-04-25 16:28:47 +08:00
parent 14bfda5e94
commit 3797f88699
2 changed files with 35 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-ui/src/views/base/project/index.vue
View File

@ -303,10 +303,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
<<<<<<< HEAD
const proIds = row.proId || this.ids
this.$modal
.confirm('是否确认删除该数据项？')
.confirm('是否确认删除所选择的数据项？')
.then(function () {
return delProject(proIds)
})
@ -315,15 +314,6 @@ export default {
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
=======
const proIds = row.proId || this.ids;
this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
return delProject(proIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
},
/** 导出按钮操作 */
handleExport() {

155
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -1,13 +1,6 @@
<template>
<div class="app-container" id="accessoryWarehousing">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -29,13 +22,7 @@
></el-date-picker>
</el-form-item>
<el-form-item label="配件类型" prop="partId">
<el-select
v-model="queryParams.partId"
placeholder="请选择配件类型"
clearable
filterable
style="width: 240px"
>
<el-select v-model="queryParams.partId" placeholder="请选择配件类型" clearable filterable style="width: 240px">
<el-option
v-for="typeItem in typeList"
:key="typeItem.partId"
@ -110,45 +97,20 @@
code
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="采购单号" align="center" prop="code" />
<el-table-column
label="采购日期"
align="center"
prop="purchaseTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="到货日期"
align="center"
prop="arrivalTime"
:show-overflow-tooltip="true"
/>
<el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" />
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
<el-table-column
label="配件类型"
align="center"
prop="purchasingTypeName"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="采购员"
align="center"
prop="purchaserName"
:show-overflow-tooltip="true"
/>
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" />
<el-table-column label="提交入库人员" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column
label="提交入库时间"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column label="提交入库时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column
label="状态"
align="center"
prop="taskStatusResult"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center" prop="taskStatusResult" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
@ -158,14 +120,18 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == 69"
>审核</el-button>
>
审核
</el-button>
<el-button
size="mini"
type="info"
icon="el-icon-edit"
v-if="scope.row.taskStatus == 70"
@click="handlePrint(scope.row)"
>入库单</el-button>
>
入库单
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -186,21 +152,8 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
:close-on-click-modal="false"
>
<el-form
:model="query"
ref="query"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="query.keyWord"
@ -293,12 +246,7 @@
<!-- >导出</el-button>-->
<!-- </el-col>-->
</el-row>
<el-table
v-loading="loading"
:data="detailTableList"
@selection-change="handleSelectionChange"
height="400"
>
<el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
@ -306,12 +254,7 @@
</template>
</el-table-column>
<el-table-column label="配件类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
:show-overflow-tooltip="true"
/>
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="statusResult">
@ -330,18 +273,10 @@
width="150"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="pass(scope.row)"
v-if="scope.row.status == 1"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status == 1"
@click="refused(scope.row)"
>不通过</el-button>
<el-button size="mini" type="text" @click="pass(scope.row)" v-if="scope.row.status == 1">通过</el-button>
<el-button size="mini" type="text" v-if="scope.row.status == 1" @click="refused(scope.row)">
不通过
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -366,16 +301,9 @@
<el-dialog :visible.sync="openPrint" width="900px" append-to-body>
<div style="height: 400px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>入库单</div>
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px">入库单</div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div
<!-- <div
class="item"
style="
width: 50%;
@ -385,19 +313,11 @@
"
>
<span>工程名称：</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
</div> -->
<div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
<span>日期：</span>
</div>
<div
<!-- <div
class="item"
style="
width: 50%;
@ -407,8 +327,8 @@
"
>
<span>领料单号</span>
</div>
<div
</div> -->
<!-- <div
class="item"
style="
width: 50%;
@ -418,16 +338,12 @@
"
>
<span>车辆信息：</span>
</div>
</div> -->
</div>
<el-table
:data="printTableData"
class="table"
style="
margin-top: 20px;
padding-bottom: 1px;
padding-right: 1px;
"
style="margin-top: 20px; padding-bottom: 1px; padding-right: 1px"
border
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
@ -440,14 +356,7 @@
<!-- <el-table-column label="出库方式" align="center" prop="manageTypeName" /> -->
</el-table>
<div
class="fillIn"
style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
<div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between">
<div class="item" style="width: 25%">
<span>审核：</span>
</div>
@ -752,7 +661,7 @@ export default {
},
/** 提交按钮 */
submitForm: function() {
submitForm: function () {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.dictId != undefined) {