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

fix:去除不通过原因字段

This commit is contained in:
jackal 2024-04-20 14:53:47 +08:00
parent 09f732bae0
commit f080f72c32
2 changed files with 643 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,19 +61,8 @@
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -112,47 +101,22 @@
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList"> <el-table v-loading="loading" :data="tableList">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column <el-table-column label="维修单号" align="center" prop="repairCode" />
label="维修单号"
align="center"
prop="repairCode"
/>
<el-table-column <el-table-column
label="工机具类型" label="工机具类型"
align="center" align="center"
prop="maTypeName" prop="maTypeName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" />
label="维修人员" <el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column>
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" /> <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" /> <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" />
@ -164,26 +128,16 @@
</template>--> </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
size="mini"
icon="el-icon-zoom-in"
@click="handleView(scope.row)"
>查看</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'" v-if="scope.row.taskStatus == '入库进行中'"
>审核</el-button >审核</el-button>
>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -204,12 +158,7 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
>
<el-form <el-form
:model="query" :model="query"
ref="query" ref="query"
@ -289,36 +238,16 @@
<!-- </el-select> --> <!-- </el-select> -->
<!-- </el-form-item> --> <!-- </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogQuery"
>查询</el-button
>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> --> <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain size="mini" :disabled="multiple" @click="passAll">批量通过</el-button>
type="primary"
plain
size="mini"
:disabled="multiple"
@click="passAll"
>批量通过</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain size="mini" @click="refusedAll" :disabled="multiple">批量不通过</el-button>
type="danger"
plain
size="mini"
@click="refusedAll"
:disabled="multiple"
>批量不通过</el-button
>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
@ -345,24 +274,9 @@
prop="typeName2" prop="typeName2"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="规格型号" <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
align="center" <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
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 <el-table-column
label="提交入库人员" label="提交入库人员"
align="center" align="center"
@ -370,19 +284,8 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100" width="100"
/> />
<el-table-column <el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column>
label="提交入库时间"
align="center"
prop="updateTime"
width="100"
>
</el-table-column>
<el-table-column
label="不通过原因"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span v-if="scope.row.status=='0'">未审核</span> <span v-if="scope.row.status=='0'">未审核</span>
@ -403,15 +306,13 @@
type="text" type="text"
@click="pass(scope.row)" @click="pass(scope.row)"
v-if="scope.row.status == '进行中'" v-if="scope.row.status == '进行中'"
>通过</el-button >通过</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '进行中'" v-if="scope.row.status == '进行中'"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button>
>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -435,20 +336,8 @@
</template> </template>
<script> <script>
import { import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
listType, import { getRepairedList, getRepairedDetailList, inputByType, getTypeList } from '@/api/store/warehousing'
getType,
delType,
addType,
updateType,
refreshCache,
} from '@/api/system/dict/type'
import {
getRepairedList,
getRepairedDetailList,
inputByType,
getTypeList,
} from '@/api/store/warehousing'
import { equipmentTypeTree } from '@/api/store/tools' import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
@ -533,17 +422,17 @@
}, },
methods: { methods: {
getTypeList() { getTypeList() {
getTypeList({ level: '3' }).then((response) => { getTypeList({ level: '3' }).then(response => {
this.typeList = response.data this.typeList = response.data
}) })
getTypeList({ level: '4' }).then((response) => { getTypeList({ level: '4' }).then(response => {
this.modelList = response.data this.modelList = response.data
}) })
}, },
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
this.loading = true this.loading = true
getRepairedList(this.queryParams).then((response) => { getRepairedList(this.queryParams).then(response => {
this.tableList = response.rows this.tableList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
@ -552,7 +441,7 @@
getDialogTable() { getDialogTable() {
this.loading = true this.loading = true
getRepairedDetailList(this.query).then((response) => { getRepairedDetailList(this.query).then(response => {
this.detailTableList = response.rows this.detailTableList = response.rows
this.dialogTotal = response.total this.dialogTotal = response.total
this.loading = false this.loading = false
@ -598,7 +487,7 @@
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item) this.ids = selection.map(item => item)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -638,7 +527,7 @@
params: JSON.stringify([obj]), params: JSON.stringify([obj]),
} }
console.log(param) console.log(param)
inputByType(param).then((response) => { inputByType(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
@ -651,7 +540,7 @@
passAll() { passAll() {
console.log(this.query.taskId) console.log(this.query.taskId)
console.log(this.ids) console.log(this.ids)
this.ids.forEach((item) => { this.ids.forEach(item => {
item.taskId = this.query.taskId item.taskId = this.query.taskId
item.checkType = '1' item.checkType = '1'
item.type = item.manageType //0.编号 1.计数 item.type = item.manageType //0.编号 1.计数
@ -659,7 +548,7 @@
let param = { let param = {
params: JSON.stringify(this.ids), params: JSON.stringify(this.ids),
} }
inputByType(param).then((response) => { inputByType(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
@ -687,7 +576,7 @@
let param = { let param = {
params: JSON.stringify([obj]), params: JSON.stringify([obj]),
} }
inputByType(param).then((response) => { inputByType(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
@ -700,7 +589,7 @@
refusedAll() { refusedAll() {
console.log(this.query.taskId) console.log(this.query.taskId)
console.log(this.ids) console.log(this.ids)
this.ids.forEach((item) => { this.ids.forEach(item => {
item.taskId = this.query.taskId item.taskId = this.query.taskId
item.checkType = '2' item.checkType = '2'
item.type = item.manageType item.type = item.manageType
@ -708,7 +597,7 @@
let param = { let param = {
params: JSON.stringify(this.ids), params: JSON.stringify(this.ids),
} }
inputByType(param).then((response) => { inputByType(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
@ -721,16 +610,16 @@
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
updateType(this.form).then((response) => { updateType(this.form).then(response => {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
this.open = false this.open = false
this.getList() this.getList()
}) })
} else { } else {
addType(this.form).then((response) => { addType(this.form).then(response => {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
this.open = false this.open = false
this.getList() this.getList()
@ -756,7 +645,7 @@
{ {
...this.queryParams, ...this.queryParams,
}, },
`修试入库_${new Date().getTime()}.xlsx`, `修试入库_${new Date().getTime()}.xlsx`
) )
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
@ -768,25 +657,17 @@
}, },
//规格型号 //规格型号
equipmentType() { equipmentType() {
equipmentTypeTree().then((response) => { equipmentTypeTree().then(response => {
this.equipmentTypeList = response.data this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => { this.equipmentTypeList.forEach((item, index) => {
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => { item.children.forEach((item2, index2) => {
if ( if (item2.children && item2.children.length > 0) {
item2.children && item2.children.forEach(item3 => {
item2.children.length > 0 if (item3.children && item3.children.length > 0) {
) { item3.children.forEach(item4 => {
item2.children.forEach((item3) => { item4.machineTypeName = item3.typeName
if ( item4.specificationType = item4.typeName
item3.children &&
item3.children.length > 0
) {
item3.children.forEach((item4) => {
item4.machineTypeName =
item3.typeName
item4.specificationType =
item4.typeName
// this.$set(item4, 'purchasePrice', 0); // this.$set(item4, 'purchasePrice', 0);
// this.$set(item4, 'purchaseNum', 1); // this.$set(item4, 'purchaseNum', 1);
}) })

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

@ -43,9 +43,9 @@ module.exports = {
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.8:8080`, //超
// target: `http://10.40.92.81:8080`, //韩 target: `http://10.40.92.81:8080`, //韩
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
target: `http://10.40.92.153:8080`, //帅 // target: `http://10.40.92.153:8080`, //帅
// target: `http://10.40.92.14:8080`, //福 // target: `http://10.40.92.14:8080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */