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

fix:bug修改

This commit is contained in:
hhui 2024-05-06 17:03:01 +08:00
parent 6015dd0ae5
commit d1d7c93872
5 changed files with 719 additions and 1345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

@ -63,7 +63,7 @@
</el-table-column>
<el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
<el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
<el-table-column label="退料数量1" align="center" :show-overflow-tooltip="true">
<el-table-column label="退料数量" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.partNum = scope.row.manageType == 0 || scope.row.manageType == 1 ? scope.row.num :
scope.row.partNum

2
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -513,7 +513,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.scrapType == '0'">自然报废</span>
<span v-if="scope.row.scrapType == '1'">任务报废</span>
<span v-if="scope.row.scrapType == '1'">人为报废</span>
</template>
</el-table-column>
<el-table-column

295
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -1,260 +1,115 @@
<template>
<el-dialog
v-dialogDrag
v-loading.fullscreen.lock="fullscreenLoading"
:before-close="cancel"
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="600px"
>
<el-dialog v-dialogDrag v-loading.fullscreen.lock="fullscreenLoading" :before-close="cancel" :title="dialogTitle"
:visible.sync="dialogShowFlag" append-to-body width="600px">
<div class="form_box_one">
<el-form
ref="dynamicValidateForm"
:model="dynamicValidateForm"
class="demo-dynamic"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateForm.premiumList"
:key="domain.key"
class="bor_box"
>
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
<div v-for="(domain, index) in dynamicValidateForm.premiumList" :key="domain.key" class="bor_box">
<p class="form_box_title">编码管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
:prop="'premiumList.' + index + '.partId'"
label="选择配件："
>
<treeselect
v-model="domain.partId"
style="width: 350px"
:options="deptList"
:normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="选择上级"
:disable-branch-nodes="true"
/>
<el-form-item :prop="'premiumList.' + index + '.partId'" label="选择配件：">
<treeselect v-model="domain.partId" style="width: 350px" :options="deptList" :normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" placeholder="请选择配件"
:disable-branch-nodes="true" />
</el-form-item>
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairer'"
label="维修人："
>
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small" filterable
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
/>
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人：">
<el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
<el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
:value="dict.userId" />
</el-select>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partType'"
label="是否收费："
>
<el-form-item :prop="'premiumList.' + index + '.partType'" label="是否收费：">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<!-- { required: true, message: '配件数量不能为空', trigger: 'blur' }, -->
<el-form-item
:prop="'premiumList.' + index + '.partNum'"
label="配件数量："
:rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
<el-form-item :prop="'premiumList.' + index + '.partNum'" label="配件数量：" :rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partCost'"
label="配件费用："
:rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partCost"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
<el-form-item :prop="'premiumList.' + index + '.partCost'" label="配件费用：" :rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="domain.partCost" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.repairContent'"
label="维修内容："
>
<el-input
v-model="domain.repairContent"
maxlength="100"
placeholder="请输入"
show-word-limit
size="small"
style="width: 350px"
type="textarea"
></el-input>
<el-form-item :prop="'premiumList.' + index + '.repairContent'" label="维修内容：">
<el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
style="width: 350px" type="textarea"></el-input>
</el-form-item>
</div>
<!-- <el-button @click.prevent="removeDomain(domain, index)"-->
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box">
<el-button
icon="el-icon-plus"
size="mini"
type="success"
@click="addDomainOne"
>添加配件
<el-button icon="el-icon-plus" size="mini" type="success" @click="addDomainOne">添加配件
</el-button>
</div>
</div>
</el-form>
<div
slot="footer"
class="dialog-footer"
v-if="rowObj.code !== null && rowObj.code !== ''"
>
<div slot="footer" class="dialog-footer" v-if="rowObj.code !== null && rowObj.code !== ''">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submit">保存</el-button>
</div>
</div>
<div class="form_box_two">
<el-form
ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo"
class="demo-dynamic"
label-width="100px"
>
<div
v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
:key="domain.key"
class="bor_box"
>
<el-form ref="dynamicValidateFormTwo" :model="dynamicValidateFormTwo" class="demo-dynamic" label-width="100px">
<div v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo" :key="domain.key" class="bor_box">
<p class="form_box_title">数量管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairNum'"
label="维修数量："
:rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.repairNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairNum'" label="维修数量：" :rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="domain.repairNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairer'"
label="维修人："
>
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small" filterable
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
/>
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人：">
<el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
<el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
:value="dict.userId" />
</el-select>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partId'"
label="选择配件："
>
<treeselect
style="width: 350px"
v-model="domain.partId"
:options="deptList"
:normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="选择上级"
:disable-branch-nodes="true"
/>
<el-form-item :prop="'premiumList.' + index + '.partId'" label="选择配件：">
<treeselect style="width: 350px" v-model="domain.partId" :options="deptList" :normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" placeholder="选择上级"
:disable-branch-nodes="true" />
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partType'"
label="是否收费："
>
<el-form-item :prop="'premiumListTwo.' + index + '.partType'" label="是否收费：">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partNum'"
label="配件数量："
:rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
<el-form-item :prop="'premiumListTwo.' + index + '.partNum'" label="配件数量：" :rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partCost'"
label="配件费用："
:rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partCost"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
<el-form-item :prop="'premiumListTwo.' + index + '.partCost'" label="配件费用：" :rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="domain.partCost" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.repairContent'"
label="维修内容："
>
<el-input
v-model="domain.repairContent"
maxlength="100"
placeholder="请输入"
show-word-limit
size="small"
style="width: 350px"
type="textarea"
></el-input>
<el-form-item :prop="'premiumListTwo.' + index + '.repairContent'" label="维修内容：">
<el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
style="width: 350px" type="textarea"></el-input>
</el-form-item>
</div>
@ -262,21 +117,12 @@
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box">
<el-button
icon="el-icon-plus"
size="mini"
type="success"
@click="addDomainTwo"
>添加配件
<el-button icon="el-icon-plus" size="mini" type="success" @click="addDomainTwo">添加配件
</el-button>
</div>
</div>
</el-form>
<div
slot="footer"
class="dialog-footer"
v-if="rowObj.code == null || rowObj.code == ''"
>
<div slot="footer" class="dialog-footer" v-if="rowObj.code == null || rowObj.code == ''">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submitTwo">保存</el-button>
</div>
@ -571,6 +417,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -602,6 +449,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -616,6 +464,7 @@ export default {
margin-right: 3%;
}
}
.dialog-footer {
display: flex;
justify-content: flex-end;

87
sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
View File

@ -1,13 +1,6 @@
<template>
<el-dialog
v-dialogDrag
v-loading.fullscreen.lock="fullscreenLoading"
:before-close="cancel"
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="600px"
>
<el-dialog v-dialogDrag v-loading.fullscreen.lock="fullscreenLoading" :before-close="cancel" :title="dialogTitle"
:visible.sync="dialogShowFlag" append-to-body width="600px">
<div class="form_box_one" v-if="!isShow">
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
<div class="bor_box">
@ -15,13 +8,8 @@
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item label="报废原因：">
<el-input
v-model="dynamicValidateForm.scrapReason"
placeholder="请输入"
size="small"
maxlength="50"
style="width: 350px"
></el-input>
<el-input v-model="dynamicValidateForm.scrapReason" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="损坏原因：">
<el-radio-group style="width: 350px" v-model="dynamicValidateForm.scrapType">
@ -39,18 +27,9 @@
:isShowTip="isShowTip"
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"
:multiple="true"
@remove="handleRemove"
@preview="handlePreview"
@exceed="handleExceed"
@before-remove="beforeRemove"
@success="handleSuccess"
>
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
</el-form-item>
@ -67,31 +46,17 @@
<p class="form_box_title">数量管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
label="报废数量："
prop="scrapNum"
:rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="dynamicValidateFormTwo.scrapNum"
placeholder="请输入"
size="small"
maxlength="10"
style="width: 350px"
></el-input>
<el-form-item label="报废数量：" prop="scrapNum" :rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}">
<el-input v-model="dynamicValidateFormTwo.scrapNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="报废原因：">
<el-input
v-model="dynamicValidateFormTwo.scrapReason"
placeholder="请输入"
size="small"
maxlength="50"
style="width: 350px"
></el-input>
<el-input v-model="dynamicValidateFormTwo.scrapReason" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="损坏原因：">
<el-radio-group style="width: 350px" v-model="dynamicValidateFormTwo.scrapType">
@ -100,7 +65,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="损坏照片：">
<el-form-item label="损坏照片1：">
<!-- <uploadImage
style="width: 250px"
:value="fileList"
@ -110,18 +75,9 @@
:isShowTip="isShowTip"
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"
:multiple="true"
@remove="handleRemove"
@preview="handlePreview"
@exceed="handleExceed"
@before-remove="beforeRemove"
@success="handleSuccess"
>
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
</el-form-item>
@ -410,6 +366,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -441,6 +398,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -455,6 +413,7 @@ export default {
margin-right: 3%;
}
}
.dialog-footer {
display: flex;
justify-content: flex-end;

1678
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

File diff suppressed because it is too large Load Diff