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

Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug

This commit is contained in:
liang.chao 2024-05-06 17:59:58 +08:00
parent 25ad01ce71 b86f8fd839
commit c0394d1f59
7 changed files with 656 additions and 1130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -47,12 +47,10 @@
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>
<el-button size="mini" icon="el-icon-delete" @click="delDomain(domain, 1)" v-show="index > 0">删除</el-button>
</div>
</div>
</el-form>
@ -114,13 +112,10 @@
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="addDomainTwo">添加配件
</el-button>
<el-button size="mini" icon="el-icon-delete" @click="delDomain(domain, 2)" v-show="index > 0">删除</el-button>
</div>
</div>
</el-form>
@ -242,11 +237,11 @@ export default {
},
//正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/;
if (value === '' || reg.test(value)) {
callback();
const reg = /^\+?[1-9][0-9]*$/
if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) {
callback()
} else {
callback(new Error('请输入大于0的正整数'));
callback(new Error('请输入大于0的并且小于维修总量的正整数'))
}
},
getTree() {
@ -320,6 +315,13 @@ export default {
key: Date.now()
});
},
delDomain(domain, type) {
if (type == 1) {
this.dynamicValidateForm.premiumList = this.dynamicValidateForm.premiumList.filter(item => item.key != domain.key);
} else {
this.dynamicValidateFormTwo.premiumListTwo = this.dynamicValidateFormTwo.premiumListTwo.filter(item => item.key != domain.key);
}
},
addDomainTwo() {
this.dynamicValidateFormTwo.premiumListTwo.push({
selected: "N",

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

@ -28,7 +28,7 @@
@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"
@remove="handleRemove" @preview="handlePreview" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
@ -65,7 +65,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="损坏照片1：">
<el-form-item label="损坏照片：">
<!-- <uploadImage
style="width: 250px"
:value="fileList"
@ -76,7 +76,7 @@
@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"
@remove="handleRemove" @preview="handlePreview" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
@ -176,11 +176,6 @@ export default {
handlePreview(file) {
console.log('file')
},
handleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
)
},
beforeRemove(file, fileList) {
// return this.$confirm(`确定移除 ${file.name}？`);
},
@ -193,10 +188,10 @@ export default {
//正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/
if (value === '' || reg.test(value)) {
if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) {
callback()
} else {
callback(new Error('请输入大于0的正整数'))
callback(new Error('请输入大于0的并且小于维修总量的正整数'))
}
},
getList() {

7
sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
View File

@ -92,8 +92,7 @@
<el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="是否收费：" required
:rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
<el-form-item label="是否收费：" required :rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
@ -272,10 +271,10 @@ export default {
//正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/;
if (reg.test(value)) {
if (reg.test(value) && value <= this.rowObj.repairNum) {
callback();
} else {
callback(new Error('请输入大于0的正整数'));
callback(new Error('请输入大于0的并且小于维修总量的正整数'));
}
},
getTree() {

18
sgzb-ui/src/views/repairTest/repair/upload.vue
View File

@ -1,19 +1,7 @@
<template>
<el-upload
class="upload-demo"
:action="actionUrl"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:multiple="multiple"
:limit="limit"
:on-exceed="handleExceed"
:file-list="fileList"
:headers="headers"
:on-success="handleSuccess"
:data="uploadData"
:before-upload="beforeUpload"
>
<el-upload class="upload-demo" :action="actionUrl" :on-preview="handlePreview" :on-remove="handleRemove"
:before-remove="beforeRemove" :multiple="multiple" :limit="limit" :on-exceed="handleExceed" :file-list="fileList"
:headers="headers" :on-success="handleSuccess" :data="uploadData" :before-upload="beforeUpload">
<slot name="default">
<el-button size="small" type="primary">点击上传</el-button>
</slot>

164
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -1,47 +1,18 @@
<template>
<div class="app-container" id="repairWarehousing">
<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"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="维修时间">
<el-date-picker
v-model="queryParams.wxTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="date"
range-separator="-"
placeholder="维修时间"
></el-date-picker>
<el-date-picker v-model="queryParams.wxTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
range-separator="-" placeholder="维修时间"></el-date-picker>
</el-form-item>
<el-form-item label="设备类型" prop="deviceTypeId">
<el-select
v-model="queryParams.deviceTypeId"
placeholder="请选择设备类型"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
<el-select v-model="queryParams.deviceTypeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
<el-option v-for="typeItem in typeList" :key="typeItem.typeId" :label="typeItem.typeName"
:value="typeItem.typeId" />
</el-select>
</el-form-item>
<!-- <el-form-item label="规格型号" prop="modelId">
@ -109,12 +80,7 @@
<el-table v-loading="loading" :data="tableList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="维修单号" align="center" prop="repairCode" />
<el-table-column
label="工机具类型"
align="center"
prop="maTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工机具类型" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
<el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" />
<el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
@ -131,13 +97,8 @@
<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>
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'"
>审核</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'">审核</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -149,33 +110,15 @@
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form
:model="query"
ref="query"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<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"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="query.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="状态" prop="status"> -->
<!-- <el-select -->
@ -192,17 +135,9 @@
<!-- </el-form-item> -->
<el-form-item label="机具类型" prop="typeId">
<treeselect
v-model="query.typeId"
default-expand-all
:options="equipmentTypeList"
placeholder="请选择规格型号"
:disable-branch-nodes="true"
style="width: 240px"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
/>
<treeselect v-model="query.typeId" default-expand-all :options="equipmentTypeList" placeholder="请选择规格型号"
:disable-branch-nodes="true" style="width: 240px" noChildrenText="没有数据了" noOptionsText="没有数据"
noResultsText="没有搜索结果" />
</el-form-item>
<!-- <el-form-item label="设备类型" prop="deviceTypeId"> -->
@ -260,34 +195,18 @@
<!-- >导出</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" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="设备类型"
align="center"
prop="typeName2"
:show-overflow-tooltip="true"
/>
<el-table-column label="设备类型" align="center" prop="typeName2" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column
label="提交入库人员"
align="center"
prop="updateBy"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
<el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column>
<el-table-column label="状态" align="center" prop="status">
@ -298,25 +217,11 @@
</template>-->
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="showHandle"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="pass(scope.row)"
v-if="scope.row.status == '进行中'"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status == '进行中'"
@click="refused(scope.row)"
>不通过</el-button>
<el-button size="mini" type="text" @click="pass(scope.row)" v-if="scope.row.status == '进行中'">通过</el-button>
<el-button size="mini" type="text" v-if="scope.row.status == '进行中'"
@click="refused(scope.row)">不通过</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -328,13 +233,8 @@
</el-table-column>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="query.pageNum"
:limit.sync="query.pageSize"
@pagination="getDialogTable"
/>
<pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
@pagination="getDialogTable" />
</el-dialog>
</div>
</template>
@ -396,6 +296,8 @@ export default {
query: {
pageNum: 1,
pageSize: 10,
keyWord: '',
typeId: ''
},
// 表单参数
form: {},
@ -498,6 +400,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
// this.reset();
this.query.keyWord = ''
this.query.taskId = row.id
this.getDialogTable()
this.open = true
@ -506,6 +409,7 @@ export default {
},
//查看
handleView(row) {
this.query.keyWord = ''
this.query.taskId = row.id
this.getDialogTable()
this.open = true
@ -613,7 +517,7 @@ export default {
},
/** 提交按钮 */
submitForm: function() {
submitForm: function () {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.dictId != undefined) {

4
sgzb-ui/vue.config.js
View File

@ -46,8 +46,8 @@ module.exports = {
// target: `http://10.40.92.8:8080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.153:8080`, //帅
target: `http://10.40.92.5:28080`, //福
target: `http://10.40.92.140:28080`, //帅
// target: `http://10.40.92.5:28080`, //福
//******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;