测试问题优化
This commit is contained in:
BianLzhaoMin
parent
78f99ec50d
commit
5911781f8b
|
|
@ -38,22 +38,22 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采购状态" prop="taskState">
|
||||
<el-select
|
||||
v-model="queryParams.taskState"
|
||||
placeholder="请选择采购状态"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 210px"
|
||||
>
|
||||
<el-option
|
||||
v-for="statusItem in statusList"
|
||||
:key="statusItem.taskState"
|
||||
:label="statusItem.label"
|
||||
:value="statusItem.taskState"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购状态" prop="taskState">
|
||||
<el-select
|
||||
v-model="queryParams.taskState"
|
||||
placeholder="请选择采购状态"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 210px"
|
||||
>
|
||||
<el-option
|
||||
v-for="statusItem in statusList"
|
||||
:key="statusItem.taskState"
|
||||
:label="statusItem.label"
|
||||
:value="statusItem.taskState"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
|
|
@ -151,12 +151,14 @@
|
|||
|
||||
<el-table-column label="采购状态" align="center" prop="taskStatus">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.taskStatus == '122'">待审核</span>
|
||||
<span v-if="scope.row.taskStatus == '105'">入库审核中</span>
|
||||
<span v-if="scope.row.taskStatus == '106'">已驳回</span>
|
||||
<span v-if="scope.row.taskStatus == '28'">已全部入库</span>
|
||||
<span v-if="scope.row.taskStatus == '107'">入库审核未通过</span>
|
||||
<span v-if="scope.row.taskStatus == '123'">部分已入库</span>
|
||||
<span v-if="scope.row.taskStatus == '122'">待审核</span>
|
||||
<span v-if="scope.row.taskStatus == '105'">入库审核中</span>
|
||||
<span v-if="scope.row.taskStatus == '106'">已驳回</span>
|
||||
<span v-if="scope.row.taskStatus == '28'">已全部入库</span>
|
||||
<span v-if="scope.row.taskStatus == '107'"
|
||||
>入库审核未通过</span
|
||||
>
|
||||
<span v-if="scope.row.taskStatus == '123'">部分已入库</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -219,6 +221,7 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
v-if="open"
|
||||
width="1000px"
|
||||
append-to-body
|
||||
>
|
||||
|
|
@ -251,36 +254,38 @@
|
|||
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row :gutter="10" class="mb8" v-if="showBatchButtons">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="passAll"
|
||||
>通过</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
size="mini"
|
||||
@click="refusedAll"
|
||||
>不通过</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="detailTableList"
|
||||
@selection-change="handleSelectionChange"
|
||||
height="400"
|
||||
>
|
||||
<!-- <el-table-column-->
|
||||
<!-- type="selection"-->
|
||||
<!-- width="55"-->
|
||||
<!-- align="center"-->
|
||||
<!-- :selectable="selectable"-->
|
||||
<!-- />-->
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
v-if="title === '审核' && showBatchButtons"
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain size="mini" @click="passAll"
|
||||
>通过</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
size="mini"
|
||||
@click="refusedAll"
|
||||
>不通过</el-button
|
||||
>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<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"
|
||||
|
|
@ -320,12 +325,12 @@
|
|||
width="200"
|
||||
/>
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="不通过原因"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="remark"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="不通过原因"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="remark"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == '0'">待审核</span>
|
||||
|
|
@ -336,37 +341,37 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="操作"-->
|
||||
<!-- align="center"-->
|
||||
<!-- class-name="small-padding fixed-width"-->
|
||||
<!-- v-if="showHandle"-->
|
||||
<!-- width="150"-->
|
||||
<!-- >-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- v-if="scope.row.status == '0'"-->
|
||||
<!-- @click="pass(scope.row)"-->
|
||||
<!-- >通过</el-button-->
|
||||
<!-- >-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- v-if="scope.row.status == '0'"-->
|
||||
<!-- @click="refused(scope.row)"-->
|
||||
<!-- >不通过</el-button-->
|
||||
<!-- >-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['system:dict:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="操作"-->
|
||||
<!-- align="center"-->
|
||||
<!-- class-name="small-padding fixed-width"-->
|
||||
<!-- v-if="showHandle"-->
|
||||
<!-- width="150"-->
|
||||
<!-- >-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- v-if="scope.row.status == '0'"-->
|
||||
<!-- @click="pass(scope.row)"-->
|
||||
<!-- >通过</el-button-->
|
||||
<!-- >-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- v-if="scope.row.status == '0'"-->
|
||||
<!-- @click="refused(scope.row)"-->
|
||||
<!-- >不通过</el-button-->
|
||||
<!-- >-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['system:dict:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
@ -562,15 +567,15 @@ export default {
|
|||
//搜索下拉数据
|
||||
typeList: [],
|
||||
modelList: [],
|
||||
// 采购状态下拉数据
|
||||
statusList: [
|
||||
{ label: '待审核', taskState: 122 },
|
||||
{ label: '入库审核中', taskState: 105 },
|
||||
{ label: '已驳回', taskState: 106 },
|
||||
{ label: '入库审核未通过', taskState: 107 },
|
||||
{ label: '部分已入库', taskState: 123 },
|
||||
{ label: '已全部入库', taskState: 28 }
|
||||
],
|
||||
// 采购状态下拉数据
|
||||
statusList: [
|
||||
{ label: '待审核', taskState: 122 },
|
||||
{ label: '入库审核中', taskState: 105 },
|
||||
{ label: '已驳回', taskState: 106 },
|
||||
{ label: '入库审核未通过', taskState: 107 },
|
||||
{ label: '部分已入库', taskState: 123 },
|
||||
{ label: '已全部入库', taskState: 28 },
|
||||
],
|
||||
// 表格数据
|
||||
tableList: [],
|
||||
detailTableList: [],
|
||||
|
|
@ -582,7 +587,7 @@ export default {
|
|||
printData: {},
|
||||
printTableData: [],
|
||||
showHandle: true,
|
||||
showBatchButtons: true,
|
||||
showBatchButtons: true,
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
// 查询参数
|
||||
|
|
@ -618,12 +623,18 @@ export default {
|
|||
},
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// 监听数据的变化，当 taskStatus 符合条件时显示批量按钮
|
||||
this.$watch('detailTableList', () => {
|
||||
this.showBatchButtons = this.detailTableList.some(item => item.taskStatus === '122');
|
||||
}, { deep: true });
|
||||
},
|
||||
mounted() {
|
||||
// 监听数据的变化，当 taskStatus 符合条件时显示批量按钮
|
||||
this.$watch(
|
||||
'detailTableList',
|
||||
() => {
|
||||
this.showBatchButtons = this.detailTableList.some(
|
||||
(item) => item.taskStatus === '122',
|
||||
)
|
||||
},
|
||||
{ deep: true },
|
||||
)
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
this.getTypeList()
|
||||
|
|
@ -708,14 +719,14 @@ export default {
|
|||
return false
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange() {
|
||||
console.log(this.ids)
|
||||
this.ids = this.detailTableList.map((item) => item) // 假设数据的唯一标识为 id
|
||||
console.log(this.ids)
|
||||
// this.single = selection.length != 1
|
||||
// this.multiple = !selection.length
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange() {
|
||||
console.log(this.ids)
|
||||
this.ids = this.detailTableList.map((item) => item) // 假设数据的唯一标识为 id
|
||||
console.log(this.ids)
|
||||
// this.single = selection.length != 1
|
||||
// this.multiple = !selection.length
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
// this.reset();
|
||||
|
|
|
|||
|
|
@ -384,13 +384,13 @@ export default {
|
|||
}
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
'maForm.purchaseTime'() {
|
||||
if (this.maForm.purchaseTime != '') {
|
||||
this.maForm.arrivalTime = ''
|
||||
}
|
||||
},
|
||||
},
|
||||
// watch: {
|
||||
// 'maForm.purchaseTime'() {
|
||||
// if (this.maForm.purchaseTime != '') {
|
||||
// this.maForm.arrivalTime = ''
|
||||
// }
|
||||
// },
|
||||
// },
|
||||
mounted() {
|
||||
// const taskId = this.$route.query && this.$route.query.taskId
|
||||
// this.taskId = taskId
|
||||
|
|
@ -493,6 +493,8 @@ export default {
|
|||
keyWord: this.queryParams.keyWord,
|
||||
}).then((response) => {
|
||||
// this.taskInfo = response.data
|
||||
|
||||
console.log(response, '编辑时的详情-------')
|
||||
this.maForm.purchaseTime = response.data.purchaseTime
|
||||
this.maForm.arrivalTime = response.data.arrivalTime
|
||||
this.maForm.purchaser = response.data.purchaser
|
||||
|
|
|
|||
|
|
@ -155,61 +155,56 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
v-if="open"
|
||||
width="1000px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-row :gutter="24" class="mb8">
|
||||
<el-form
|
||||
ref="form"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="78px"
|
||||
v-if="!isDetail"
|
||||
>
|
||||
<el-input v-model="form.typeId" disabled v-show="false" />
|
||||
<el-col :span="7">
|
||||
<el-form-item label="编码前缀" prop="exCode">
|
||||
<el-input
|
||||
v-model="form.exCode"
|
||||
@change="fillingCodeList"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="后缀范围">
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="form.str"
|
||||
placeholder="0001"
|
||||
maxlength="4"
|
||||
@change="fillingCodeList"
|
||||
></el-input>
|
||||
-
|
||||
<el-input
|
||||
v-model="form.str1"
|
||||
placeholder="0005"
|
||||
maxlength="4"
|
||||
@change="fillingCodeList"
|
||||
></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="固定资产" prop="fixCode">
|
||||
<el-select
|
||||
v-model="form.fixCode"
|
||||
placeholder="是否为固定资产"
|
||||
@change="fillingCodeList"
|
||||
clearable
|
||||
allow-create
|
||||
>
|
||||
<el-option label="是" value="0" />
|
||||
<el-option label="否" value="1" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="2">
|
||||
<el-form
|
||||
ref="formCodeRef"
|
||||
:model="form"
|
||||
:rules="codeRules"
|
||||
:inline="true"
|
||||
label-width="78px"
|
||||
v-if="!isDetail"
|
||||
>
|
||||
<el-input v-model="form.typeId" disabled v-show="false" />
|
||||
|
||||
<el-form-item label="编码前缀" prop="exCode">
|
||||
<el-input v-model="form.exCode" @change="fillingCodeList" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="后缀范围" prop="suffixOneCode">
|
||||
<el-input
|
||||
v-model="form.suffixOneCode"
|
||||
placeholder="0001"
|
||||
maxlength="4"
|
||||
style="width: 100px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="suffixTwoCode">
|
||||
<el-input
|
||||
v-model="form.suffixTwoCode"
|
||||
placeholder="0005"
|
||||
maxlength="4"
|
||||
style="width: 100px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="固定资产" prop="fixCode">
|
||||
<el-select
|
||||
v-model="form.fixCode"
|
||||
placeholder="是否为固定资产"
|
||||
@change="fillingCodeList"
|
||||
clearable
|
||||
allow-create
|
||||
style="width: 100px"
|
||||
>
|
||||
<el-option label="是" value="0" />
|
||||
<el-option label="否" value="1" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-col :span="2">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
|
|
@ -217,16 +212,21 @@
|
|||
@click="createCodeList"
|
||||
>生成</el-button>
|
||||
</el-col>-->
|
||||
<el-col :span="2">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="fillingCodeList"
|
||||
>填充</el-button
|
||||
>
|
||||
</el-col>
|
||||
</el-form>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="fillingCodeList"
|
||||
>填充</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row class="surplus-code">
|
||||
剩余待编码数量：<span style="color: red">{{
|
||||
surplusNoBindNum
|
||||
}}</span>
|
||||
</el-row>
|
||||
<el-table v-loading="loading" :data="codeList" height="400">
|
||||
<!-- <el-table-column type="selection" width="50" align="center" /> -->
|
||||
|
|
@ -381,6 +381,9 @@ export default {
|
|||
str1: '',
|
||||
fixCode: '1',
|
||||
typeId: '',
|
||||
|
||||
suffixOneCode: 0,
|
||||
suffixTwoCode: 0,
|
||||
},
|
||||
codeList: [], //弹窗列表list
|
||||
getCodeList: [], //已成过的编码list
|
||||
|
|
@ -397,7 +400,36 @@ export default {
|
|||
// { required: true, message: "设备编号不能为空", trigger: "blur" }
|
||||
// ],
|
||||
},
|
||||
|
||||
codeRules: {
|
||||
suffixOneCode: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入后缀范围',
|
||||
trigger: 'blur',
|
||||
},
|
||||
// {
|
||||
// pattern: /^[1-9]\d*$/,
|
||||
// message: '请输入正整数',
|
||||
// trigger: 'blur',
|
||||
// },
|
||||
],
|
||||
suffixTwoCode: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入后缀范围',
|
||||
trigger: 'blur',
|
||||
},
|
||||
// {
|
||||
// pattern: /^[1-9]\d*$/,
|
||||
// message: '请输入正整数',
|
||||
// trigger: 'blur',
|
||||
// },
|
||||
],
|
||||
},
|
||||
isDetail: false,
|
||||
|
||||
surplusNoBindNum: 0,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -509,6 +541,9 @@ export default {
|
|||
// this.codeList = response.data;
|
||||
|
||||
// });
|
||||
|
||||
this.surplusNoBindNum =
|
||||
parseInt(this.form.checkNum) - parseInt(this.form.bindNum)
|
||||
},
|
||||
//生成列表codeList
|
||||
createCodeList() {
|
||||
|
|
@ -532,15 +567,94 @@ export default {
|
|||
},
|
||||
//填充按钮
|
||||
fillingCodeList() {
|
||||
console.log(Number(this.form.str))
|
||||
this.codeList = []
|
||||
let num = Number(this.form.str)
|
||||
// console.log(Number(this.form.str1))
|
||||
let num1 = Number(this.form.str1)
|
||||
let count = num1 - num + 1 //生成数量
|
||||
console.log()
|
||||
let sum = count + this.form.bindNum
|
||||
console.log(sum)
|
||||
// console.log(Number(this.form.str))
|
||||
// this.codeList = []
|
||||
// let num = Number(this.form.str)
|
||||
// // console.log(Number(this.form.str1))
|
||||
// let num1 = Number(this.form.str1)
|
||||
// let count = num1 - num + 1 //生成数量
|
||||
// console.log()
|
||||
// let sum = count + this.form.bindNum
|
||||
// console.log(sum)
|
||||
if (this.codeList.length === this.surplusNoBindNum) {
|
||||
this.$modal.msgError('当前编码已填充，不可重复操作！')
|
||||
return
|
||||
}
|
||||
|
||||
this.$refs['formCodeRef'].validate((valid) => {
|
||||
if (valid) {
|
||||
if (
|
||||
isNaN(this.form.suffixOneCode) ||
|
||||
isNaN(this.form.suffixTwoCode) ||
|
||||
parseInt(this.form.suffixOneCode) >
|
||||
parseInt(this.form.suffixTwoCode)
|
||||
) {
|
||||
this.$modal.msgError('编码后缀范围输入格式不正确')
|
||||
return
|
||||
}
|
||||
let suffixOneCode = parseInt(this.form.suffixOneCode)
|
||||
let suffixTwoCode = parseInt(this.form.suffixTwoCode)
|
||||
let sumNum = suffixTwoCode - suffixOneCode + 1
|
||||
// // 剩余待绑定数量
|
||||
// let surplusNoBindNum =
|
||||
// parseInt(this.form.checkNum) -
|
||||
// parseInt(this.form.bindNum)
|
||||
|
||||
if (sumNum > this.surplusNoBindNum) {
|
||||
this.$modal.msgError(
|
||||
'当前选择的编码数量已超过剩余未编码数量！',
|
||||
)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
if (this.codeList.length === 0) {
|
||||
for (let i = 0; i < sumNum; i++) {
|
||||
let obj = {
|
||||
typeName: this.form.typeName,
|
||||
specificationType: this.form.specificationType,
|
||||
typeId: this.form.typeId,
|
||||
taskId: this.form.taskId,
|
||||
maCode:
|
||||
this.form.exCode +
|
||||
('00000' + (suffixOneCode + i)).slice(-4),
|
||||
assetsCode: '',
|
||||
fixCode: this.form.fixCode,
|
||||
id: ('00000' + (suffixOneCode + i)).slice(-4),
|
||||
}
|
||||
this.codeList.push(obj)
|
||||
}
|
||||
} else {
|
||||
for (let i = 0; i < sumNum; i++) {
|
||||
let obj = {
|
||||
typeName: this.form.typeName,
|
||||
specificationType: this.form.specificationType,
|
||||
typeId: this.form.typeId,
|
||||
taskId: this.form.taskId,
|
||||
maCode:
|
||||
this.form.exCode +
|
||||
('00000' + (suffixOneCode + i)).slice(-4),
|
||||
assetsCode: '',
|
||||
fixCode: this.form.fixCode,
|
||||
id: ('00000' + (suffixOneCode + i)).slice(-4),
|
||||
}
|
||||
|
||||
const isRepeat = this.codeList.every(
|
||||
(e) => e.id != obj.id,
|
||||
)
|
||||
if (isRepeat) {
|
||||
this.codeList.push(obj)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.surplusNoBindNum -= this.codeList.length
|
||||
}
|
||||
})
|
||||
|
||||
if (true) {
|
||||
return
|
||||
}
|
||||
if (sum > this.form.checkNum) {
|
||||
this.$modal.msgError(
|
||||
'已绑定编码' +
|
||||
|
|
@ -644,6 +758,8 @@ export default {
|
|||
this.codeList.splice(index, 1)
|
||||
}
|
||||
})
|
||||
|
||||
this.surplusNoBindNum += 1
|
||||
// const maCode = row.maCode ;
|
||||
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
|
||||
// return delMacodeList(maCode);
|
||||
|
|
@ -684,4 +800,10 @@ export default {
|
|||
width: 60px !important;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.surplus-code {
|
||||
padding-bottom: 10px;
|
||||
padding-left: 8px;
|
||||
font-size: 16px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -353,10 +353,15 @@
|
|||
font-size: 14px;
|
||||
"
|
||||
>
|
||||
<span>供应商：</span
|
||||
><span v-if="printTableData.length > 0">{{
|
||||
printTableData[0].supplier
|
||||
}}</span>
|
||||
<span>供应商：</span>
|
||||
<!-- <span v-if="printTableData.length > 0">{{
|
||||
printTableData[0].supplier
|
||||
}}</span>
|
||||
-->
|
||||
|
||||
<span v-if="printTableData.length > 0">
|
||||
{{ supplierListNew }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
|
|
@ -539,6 +544,8 @@ export default {
|
|||
openPrint: false,
|
||||
printData: {},
|
||||
printTableData: [],
|
||||
|
||||
supplierNew: '', // 验收单中的供应商字段
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -650,8 +657,19 @@ export default {
|
|||
//获取验收单数据
|
||||
getPrintTable(taskId) {
|
||||
getAcceptanceForm({ taskId: taskId }).then((response) => {
|
||||
console.log(response, '验收单返回的数据')
|
||||
this.printData = response.data
|
||||
this.printTableData = response.data.checkDetailsList
|
||||
|
||||
let supplierList = []
|
||||
this.printTableData.map((e) => {
|
||||
if (e.supplier) {
|
||||
supplierList.push(e.supplier)
|
||||
}
|
||||
})
|
||||
|
||||
const supplierListNew = [...new Set(supplierList)]
|
||||
this.supplierListNew = supplierListNew.join('，')
|
||||
})
|
||||
},
|
||||
//查看验收单
|
||||
|
|
|
|||
|
|
@ -141,14 +141,31 @@
|
|||
prop="checkUrlName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<div
|
||||
<template
|
||||
v-if="
|
||||
scope.row.imgUrlList &&
|
||||
scope.row.imgUrlList.length > 0
|
||||
"
|
||||
>
|
||||
<ImagePreview
|
||||
v-for="(item, index) in scope.row.imgUrlList"
|
||||
:key="index"
|
||||
:src="`${uploadUrl}${item}`"
|
||||
:width="`20px`"
|
||||
:height="`20px`"
|
||||
class="img-box"
|
||||
/>
|
||||
</template>
|
||||
<template v-else> - </template>
|
||||
|
||||
<!-- <div
|
||||
v-for="(item, index) in scope.row.imgUrlList"
|
||||
:key="index"
|
||||
@click="openImg(item)"
|
||||
style="color: #02a7f0; cursor: pointer"
|
||||
>
|
||||
{{ scope.row.imgNameList[index] }}
|
||||
</div>
|
||||
</div> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="配套资料" align="center" prop="fileName" :show-overflow-tooltip="true" /> -->
|
||||
|
|
@ -159,14 +176,14 @@
|
|||
width="180"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0">未验收</span>
|
||||
<span v-if="scope.row.status == 1">已验收</span>
|
||||
<span v-if="scope.row.status == 2">待通知</span>
|
||||
<span v-if="scope.row.status == 3">验收不通过</span>
|
||||
<span v-if="scope.row.status == 4">已入库</span>
|
||||
<span v-if="scope.row.status == 5">入库驳回</span>
|
||||
<span v-if="scope.row.status == 6">入库待审核</span>
|
||||
<span v-if="scope.row.status == 7">综合服务中心未通过</span>
|
||||
<span v-if="scope.row.status == 0">未验收</span>
|
||||
<span v-if="scope.row.status == 1">已验收</span>
|
||||
<span v-if="scope.row.status == 2">待通知</span>
|
||||
<span v-if="scope.row.status == 3">验收不通过</span>
|
||||
<span v-if="scope.row.status == 4">已入库</span>
|
||||
<span v-if="scope.row.status == 5">入库驳回</span>
|
||||
<span v-if="scope.row.status == 6">入库待审核</span>
|
||||
<span v-if="scope.row.status == 7">综合服务中心未通过</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -203,6 +220,7 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
v-if="open"
|
||||
width="650px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
|
|
@ -260,6 +278,9 @@
|
|||
>
|
||||
<!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
|
||||
<i class="el-icon-plus avatar-uploader-icon"></i>
|
||||
<div class="el-upload__tip" slot="tip"
|
||||
>请上传.png、.jpg,、.jpeg类型文件，且文件个数不可超过5个</div
|
||||
>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
@ -273,6 +294,7 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="openAll"
|
||||
v-if="openAll"
|
||||
width="650px"
|
||||
append-to-body
|
||||
>
|
||||
|
|
@ -302,7 +324,11 @@
|
|||
:on-remove="handleRemove"
|
||||
>
|
||||
<!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
|
||||
<i class="el-icon-plus avatar-uploader-icon"></i>
|
||||
<i class="el-icon-plus avatar-uploader-icon"> </i>
|
||||
|
||||
<div class="el-upload__tip" slot="tip"
|
||||
>请上传.png、.jpg,、.jpeg类型文件，且文件个数不可超过5个</div
|
||||
>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
@ -318,6 +344,7 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="noticeOpen"
|
||||
v-if="noticeOpen"
|
||||
width="1000px"
|
||||
append-to-body
|
||||
>
|
||||
|
|
@ -773,6 +800,11 @@ export default {
|
|||
//添加人员
|
||||
addUser() {
|
||||
// console.log(this.chosenUserList,"chosenUserList")
|
||||
|
||||
if (this.chosenUserList.length < 1) {
|
||||
this.$message.error('请选择添加的人员！')
|
||||
return
|
||||
}
|
||||
addNoticeUser(this.chosenUserList).then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.getNoticeUserList()
|
||||
|
|
@ -876,13 +908,13 @@ export default {
|
|||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function () {
|
||||
// console.log(this.form)
|
||||
this.form.checkUrl = this.checkUrlList.join(',')
|
||||
this.form.checkUrlName = this.checkUrlNameList.join(',')
|
||||
let equipments = [this.form]
|
||||
console.log(equipments)
|
||||
// console.log(this.form)
|
||||
// console.log(equipments)
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
let equipments = [this.form]
|
||||
updatePurchaseCheckDetails(equipments).then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.$message({
|
||||
|
|
@ -900,20 +932,20 @@ export default {
|
|||
})
|
||||
},
|
||||
submitListForm: function () {
|
||||
// console.log(this.aform)
|
||||
this.aform.checkUrl = this.checkUrlList1.join(',')
|
||||
this.aform.checkUrlName = this.checkUrlNameList1.join(',')
|
||||
this.ids.forEach((item) => {
|
||||
item.checkNum = item.purchaseNum
|
||||
item.checkResult = this.aform.checkResult
|
||||
item.checkUrl = this.aform.checkUrl
|
||||
item.checkUrlName = this.aform.checkUrlName
|
||||
})
|
||||
// console.log(this.ids)
|
||||
let equipments = this.ids
|
||||
console.log(equipments)
|
||||
// console.log(this.aform)
|
||||
// console.log(equipments)
|
||||
this.$refs['aform'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.ids.forEach((item) => {
|
||||
item.checkNum = item.purchaseNum
|
||||
item.checkResult = this.aform.checkResult
|
||||
item.checkUrl = this.aform.checkUrl
|
||||
item.checkUrlName = this.aform.checkUrlName
|
||||
})
|
||||
// console.log(this.ids)
|
||||
let equipments = this.ids
|
||||
updatePurchaseCheckDetails(equipments).then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.$message({
|
||||
|
|
@ -1034,4 +1066,15 @@ export default {
|
|||
display: none;
|
||||
}
|
||||
}
|
||||
.img-box {
|
||||
margin-right: 8px;
|
||||
}
|
||||
.img-box:last-child {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.el-upload__tip {
|
||||
font-size: 14px;
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -9,40 +9,39 @@
|
|||
v-show="showSearch"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="typeItem in typesList"
|
||||
:key="typeItem.typeId"
|
||||
:label="typeItem.typeName"
|
||||
:value="typeItem.typeId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="typeItem in typesList"
|
||||
:key="typeItem.typeId"
|
||||
:label="typeItem.typeName"
|
||||
:value="typeItem.typeId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采购状态" prop="taskStatus">
|
||||
<el-select
|
||||
v-model="queryParams.taskStatus"
|
||||
placeholder="请选择采购状态"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="statusItem in statusList"
|
||||
:key="statusItem.taskStatus"
|
||||
:label="statusItem.label"
|
||||
:value="statusItem.taskStatus"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购状态" prop="taskStatus">
|
||||
<el-select
|
||||
v-model="queryParams.taskStatus"
|
||||
placeholder="请选择采购状态"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="statusItem in statusList"
|
||||
:key="statusItem.taskStatus"
|
||||
:label="statusItem.label"
|
||||
:value="statusItem.taskStatus"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
|
|
@ -156,30 +155,30 @@
|
|||
/>
|
||||
<el-table-column label="状态" align="center" prop="taskStatus">
|
||||
<template slot-scope="scope">
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="success"
|
||||
v-if="scope.row.taskStatus == '28'"
|
||||
>已全部入库</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="warning"
|
||||
v-if="scope.row.taskStatus == '105'"
|
||||
>入库审核中</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="danger"
|
||||
v-if="scope.row.taskStatus == '107'"
|
||||
>入库审核未通过</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="success"
|
||||
v-if="scope.row.taskStatus == '123'"
|
||||
>部分已入库</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="success"
|
||||
v-if="scope.row.taskStatus == '28'"
|
||||
>已全部入库</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="warning"
|
||||
v-if="scope.row.taskStatus == '105'"
|
||||
>入库审核中</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="danger"
|
||||
v-if="scope.row.taskStatus == '107'"
|
||||
>入库审核未通过</el-tag
|
||||
>
|
||||
<el-tag
|
||||
size="mini"
|
||||
type="success"
|
||||
v-if="scope.row.taskStatus == '123'"
|
||||
>部分已入库</el-tag
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
|
@ -198,9 +197,7 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-if="
|
||||
scope.row.taskStatus == '105'
|
||||
"
|
||||
v-if="scope.row.taskStatus == '105'"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['warehousing:newTools:auditing']"
|
||||
>审核</el-button
|
||||
|
|
@ -209,7 +206,10 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-if="scope.row.taskStatus == '28' || scope.row.taskStatus == '123'"
|
||||
v-if="
|
||||
scope.row.taskStatus == '28' ||
|
||||
scope.row.taskStatus == '123'
|
||||
"
|
||||
@click="handlePrint(scope.row)"
|
||||
v-hasPermi="['warehousing:newTools:list']"
|
||||
>入库单</el-button
|
||||
|
|
@ -230,6 +230,7 @@
|
|||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
v-if="open"
|
||||
width="1000px"
|
||||
append-to-body
|
||||
>
|
||||
|
|
@ -358,10 +359,10 @@
|
|||
<!-- <el-table-column label="不通过原因" align="center" prop="remark" show-overflow-tooltip /> -->
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == '0'">待审核</span>
|
||||
<span v-if="scope.row.status == '1'">已入库</span>
|
||||
<span v-if="scope.row.status == '2'">已驳回</span>
|
||||
<span v-if="scope.row.status == '3'">待审核</span>
|
||||
<span v-if="scope.row.status == '0'">待审核</span>
|
||||
<span v-if="scope.row.status == '1'">已入库</span>
|
||||
<span v-if="scope.row.status == '2'">已驳回</span>
|
||||
<span v-if="scope.row.status == '3'">待审核</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
|
@ -384,7 +385,8 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
v-if="
|
||||
(scope.row.status == '0' || scope.row.status == '3') &&
|
||||
(scope.row.status == '0' ||
|
||||
scope.row.status == '3') &&
|
||||
scope.row.userIds.includes(userId)
|
||||
"
|
||||
@click="pass(scope.row)"
|
||||
|
|
@ -394,7 +396,8 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
v-if="
|
||||
(scope.row.status == '0' || scope.row.status == '3') &&
|
||||
(scope.row.status == '0' ||
|
||||
scope.row.status == '3') &&
|
||||
scope.row.userIds.includes(userId)
|
||||
"
|
||||
@click="refused(scope.row)"
|
||||
|
|
@ -702,19 +705,19 @@ export default {
|
|||
},
|
||||
//是否可用勾选框
|
||||
selectable(row) {
|
||||
console.log(row)
|
||||
if (row.status == '0' || row.status == '3') {
|
||||
if (
|
||||
(row.manageType == '0' && row.maCode) ||
|
||||
row.manageType == '1'
|
||||
) {
|
||||
return true
|
||||
console.log(row)
|
||||
if (row.status == '0' || row.status == '3') {
|
||||
if (
|
||||
(row.manageType == '0' && row.maCode) ||
|
||||
row.manageType == '1'
|
||||
) {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
return false
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
|
|
@ -877,6 +880,17 @@ export default {
|
|||
)
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
open: {
|
||||
handler(newValue) {
|
||||
if (!newValue) {
|
||||
this.query.dictName = ''
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -44,10 +44,10 @@ module.exports = {
|
|||
// target: `https://z.csgmall.com.cn`,
|
||||
|
||||
// target: `http://10.40.92.60:28080`, //超
|
||||
// target: `http://10.40.92.81:8080`, //韩/
|
||||
target: `http://10.40.92.81:28080`, //韩/
|
||||
// target: `http://10.40.92.74:8080`,//旭/
|
||||
// target: `http://10.40.92.140:28080`, //帅
|
||||
target: `http://10.40.92.253:28080`, //福
|
||||
// target: `http://10.40.92.253:28080`, //福
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
|
||||
|
|
|
|||
Loading…
Reference in New Issue