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

测试问题优化

This commit is contained in:
BianLzhaoMin 2024-06-20 18:03:57 +08:00
parent 78f99ec50d
commit 5911781f8b
7 changed files with 508 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
View File

@ -155,7 +155,9 @@
<span v-if="scope.row.taskStatus == '105'">入库审核中</span> <span v-if="scope.row.taskStatus == '105'">入库审核中</span>
<span v-if="scope.row.taskStatus == '106'">已驳回</span> <span v-if="scope.row.taskStatus == '106'">已驳回</span>
<span v-if="scope.row.taskStatus == '28'">已全部入库</span> <span v-if="scope.row.taskStatus == '28'">已全部入库</span>
<span v-if="scope.row.taskStatus == '107'">入库审核未通过</span> <span v-if="scope.row.taskStatus == '107'"
>入库审核未通过</span
>
<span v-if="scope.row.taskStatus == '123'">部分已入库</span> <span v-if="scope.row.taskStatus == '123'">部分已入库</span>
</template> </template>
</el-table-column> </el-table-column>
@ -219,6 +221,7 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
v-if="open"
width="1000px" width="1000px"
append-to-body append-to-body
> >
@ -251,14 +254,15 @@
<!-- <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" v-if="showBatchButtons"> <el-row
:gutter="10"
class="mb8"
v-if="title === '审核' && showBatchButtons"
>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain size="mini" @click="passAll"
type="primary" >通过</el-button
plain >
size="mini"
@click="passAll"
>通过</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -266,7 +270,8 @@
plain plain
size="mini" size="mini"
@click="refusedAll" @click="refusedAll"
>不通过</el-button> >不通过</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table
@ -320,12 +325,12 @@
width="200" width="200"
/> />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="不通过原因"--> <!-- label="不通过原因"-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="remark"--> <!-- prop="remark"-->
<!-- :show-overflow-tooltip="true"--> <!-- :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>
@ -336,28 +341,28 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="操作"--> <!-- label="操作"-->
<!-- align="center"--> <!-- align="center"-->
<!-- class-name="small-padding fixed-width"--> <!-- class-name="small-padding fixed-width"-->
<!-- v-if="showHandle"--> <!-- v-if="showHandle"-->
<!-- width="150"--> <!-- width="150"-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
<!-- v-if="scope.row.status == '0'"--> <!-- v-if="scope.row.status == '0'"-->
<!-- @click="pass(scope.row)"--> <!-- @click="pass(scope.row)"-->
<!-- >通过</el-button--> <!-- >通过</el-button-->
<!-- >--> <!-- >-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
<!-- v-if="scope.row.status == '0'"--> <!-- v-if="scope.row.status == '0'"-->
<!-- @click="refused(scope.row)"--> <!-- @click="refused(scope.row)"-->
<!-- >不通过</el-button--> <!-- >不通过</el-button-->
<!-- >--> <!-- >-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -365,8 +370,8 @@
<!-- @click="handleDelete(scope.row)"--> <!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:dict:remove']"--> <!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@ -569,7 +574,7 @@ export default {
{ label: '已驳回', taskState: 106 }, { label: '已驳回', taskState: 106 },
{ label: '入库审核未通过', taskState: 107 }, { label: '入库审核未通过', taskState: 107 },
{ label: '部分已入库', taskState: 123 }, { label: '部分已入库', taskState: 123 },
{ label: '已全部入库', taskState: 28 } { label: '已全部入库', taskState: 28 },
], ],
// 表格数据 // 表格数据
tableList: [], tableList: [],
@ -620,9 +625,15 @@ export default {
}, },
mounted() { mounted() {
// 监听数据的变化，当 taskStatus 符合条件时显示批量按钮 // 监听数据的变化，当 taskStatus 符合条件时显示批量按钮
this.$watch('detailTableList', () => { this.$watch(
this.showBatchButtons = this.detailTableList.some(item => item.taskStatus === '122'); 'detailTableList',
}, { deep: true }); () => {
this.showBatchButtons = this.detailTableList.some(
(item) => item.taskStatus === '122',
)
},
{ deep: true },
)
}, },
created() { created() {
this.getList() this.getList()

16
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
View File

@ -384,13 +384,13 @@ export default {
} }
}, },
}, },
watch: { // watch: {
'maForm.purchaseTime'() { // 'maForm.purchaseTime'() {
if (this.maForm.purchaseTime != '') { // if (this.maForm.purchaseTime != '') {
this.maForm.arrivalTime = '' // this.maForm.arrivalTime = ''
} // }
}, // },
}, // },
mounted() { mounted() {
// const taskId = this.$route.query && this.$route.query.taskId // const taskId = this.$route.query && this.$route.query.taskId
// this.taskId = taskId // this.taskId = taskId
@ -493,6 +493,8 @@ export default {
keyWord: this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
}).then((response) => { }).then((response) => {
// this.taskInfo = response.data // this.taskInfo = response.data
console.log(response, '编辑时的详情-------')
this.maForm.purchaseTime = response.data.purchaseTime this.maForm.purchaseTime = response.data.purchaseTime
this.maForm.arrivalTime = response.data.arrivalTime this.maForm.arrivalTime = response.data.arrivalTime
this.maForm.purchaser = response.data.purchaser this.maForm.purchaser = response.data.purchaser

190
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
View File

@ -155,47 +155,42 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
v-if="open"
width="1000px" width="1000px"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-row :gutter="24" class="mb8">
<el-form <el-form
ref="form" ref="formCodeRef"
:model="form" :model="form"
:rules="rules" :rules="codeRules"
:inline="true"
label-width="78px" label-width="78px"
v-if="!isDetail" v-if="!isDetail"
> >
<el-input v-model="form.typeId" disabled v-show="false" /> <el-input v-model="form.typeId" disabled v-show="false" />
<el-col :span="7">
<el-form-item label="编码前缀" prop="exCode"> <el-form-item label="编码前缀" prop="exCode">
<el-input <el-input v-model="form.exCode" @change="fillingCodeList" />
v-model="form.exCode"
@change="fillingCodeList"
/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="7"> <el-form-item label="后缀范围" prop="suffixOneCode">
<el-form-item label="后缀范围">
<div style="display: flex">
<el-input <el-input
v-model="form.str" v-model="form.suffixOneCode"
placeholder="0001" placeholder="0001"
maxlength="4" maxlength="4"
@change="fillingCodeList" style="width: 100px"
></el-input> />
- </el-form-item>
<el-form-item prop="suffixTwoCode">
<el-input <el-input
v-model="form.str1" v-model="form.suffixTwoCode"
placeholder="0005" placeholder="0005"
maxlength="4" maxlength="4"
@change="fillingCodeList" style="width: 100px"
></el-input> />
</div>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="固定资产" prop="fixCode"> <el-form-item label="固定资产" prop="fixCode">
<el-select <el-select
v-model="form.fixCode" v-model="form.fixCode"
@ -203,12 +198,12 @@
@change="fillingCodeList" @change="fillingCodeList"
clearable clearable
allow-create allow-create
style="width: 100px"
> >
<el-option label="是" value="0" /> <el-option label="是" value="0" />
<el-option label="否" value="1" /> <el-option label="否" value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<!-- <el-col :span="2"> <!-- <el-col :span="2">
<el-button <el-button
type="primary" type="primary"
@ -217,7 +212,7 @@
@click="createCodeList" @click="createCodeList"
>生成</el-button> >生成</el-button>
</el-col>--> </el-col>-->
<el-col :span="2"> <el-form-item>
<el-button <el-button
type="primary" type="primary"
plain plain
@ -225,8 +220,13 @@
@click="fillingCodeList" @click="fillingCodeList"
>填充</el-button >填充</el-button
> >
</el-col> </el-form-item>
</el-form> </el-form>
<el-row class="surplus-code">
剩余待编码数量：<span style="color: red">{{
surplusNoBindNum
}}</span>
</el-row> </el-row>
<el-table v-loading="loading" :data="codeList" height="400"> <el-table v-loading="loading" :data="codeList" height="400">
<!-- <el-table-column type="selection" width="50" align="center" /> --> <!-- <el-table-column type="selection" width="50" align="center" /> -->
@ -381,6 +381,9 @@ export default {
str1: '', str1: '',
fixCode: '1', fixCode: '1',
typeId: '', typeId: '',
suffixOneCode: 0,
suffixTwoCode: 0,
}, },
codeList: [], //弹窗列表list codeList: [], //弹窗列表list
getCodeList: [], //已成过的编码list getCodeList: [], //已成过的编码list
@ -397,7 +400,36 @@ export default {
// { required: true, message: "设备编号不能为空", trigger: "blur" } // { 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, isDetail: false,
surplusNoBindNum: 0,
} }
}, },
mounted() { mounted() {
@ -509,6 +541,9 @@ export default {
// this.codeList = response.data; // this.codeList = response.data;
// }); // });
this.surplusNoBindNum =
parseInt(this.form.checkNum) - parseInt(this.form.bindNum)
}, },
//生成列表codeList //生成列表codeList
createCodeList() { createCodeList() {
@ -532,15 +567,94 @@ export default {
}, },
//填充按钮 //填充按钮
fillingCodeList() { fillingCodeList() {
console.log(Number(this.form.str)) // console.log(Number(this.form.str))
this.codeList = [] // this.codeList = []
let num = Number(this.form.str) // let num = Number(this.form.str)
// console.log(Number(this.form.str1)) // // console.log(Number(this.form.str1))
let num1 = Number(this.form.str1) // let num1 = Number(this.form.str1)
let count = num1 - num + 1 //生成数量 // let count = num1 - num + 1 //生成数量
console.log() // console.log()
let sum = count + this.form.bindNum // let sum = count + this.form.bindNum
console.log(sum) // 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) { if (sum > this.form.checkNum) {
this.$modal.msgError( this.$modal.msgError(
'已绑定编码' + '已绑定编码' +
@ -644,6 +758,8 @@ export default {
this.codeList.splice(index, 1) this.codeList.splice(index, 1)
} }
}) })
this.surplusNoBindNum += 1
// const maCode = row.maCode ; // const maCode = row.maCode ;
// this.$modal.confirm('是否确认删除该数据项？').then(function() { // this.$modal.confirm('是否确认删除该数据项？').then(function() {
// return delMacodeList(maCode); // return delMacodeList(maCode);
@ -684,4 +800,10 @@ export default {
width: 60px !important; width: 60px !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
.surplus-code {
padding-bottom: 10px;
padding-left: 8px;
font-size: 16px;
}
</style> </style>

22
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
View File

@ -353,10 +353,15 @@
font-size: 14px; font-size: 14px;
" "
> >
<span>供应商：</span <span>供应商：</span>
><span v-if="printTableData.length > 0">{{ <!-- <span v-if="printTableData.length > 0">{{
printTableData[0].supplier printTableData[0].supplier
}}</span> }}</span>
-->
<span v-if="printTableData.length > 0">
{{ supplierListNew }}
</span>
</div> </div>
</div> </div>
<el-table <el-table
@ -539,6 +544,8 @@ export default {
openPrint: false, openPrint: false,
printData: {}, printData: {},
printTableData: [], printTableData: [],
supplierNew: '', // 验收单中的供应商字段
} }
}, },
created() { created() {
@ -650,8 +657,19 @@ export default {
//获取验收单数据 //获取验收单数据
getPrintTable(taskId) { getPrintTable(taskId) {
getAcceptanceForm({ taskId: taskId }).then((response) => { getAcceptanceForm({ taskId: taskId }).then((response) => {
console.log(response, '验收单返回的数据')
this.printData = response.data this.printData = response.data
this.printTableData = response.data.checkDetailsList 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('，')
}) })
}, },
//查看验收单 //查看验收单

63
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
View File

@ -141,14 +141,31 @@
prop="checkUrlName" prop="checkUrlName"
> >
<template slot-scope="scope"> <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" v-for="(item, index) in scope.row.imgUrlList"
:key="index" :key="index"
@click="openImg(item)" @click="openImg(item)"
style="color: #02a7f0; cursor: pointer" style="color: #02a7f0; cursor: pointer"
> >
{{ scope.row.imgNameList[index] }} {{ scope.row.imgNameList[index] }}
</div> </div> -->
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="配套资料" align="center" prop="fileName" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="配套资料" align="center" prop="fileName" :show-overflow-tooltip="true" /> -->
@ -203,6 +220,7 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
v-if="open"
width="650px" width="650px"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
@ -260,6 +278,9 @@
> >
<!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> --> <!-- <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-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -273,6 +294,7 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="openAll" :visible.sync="openAll"
v-if="openAll"
width="650px" width="650px"
append-to-body append-to-body
> >
@ -302,7 +324,11 @@
:on-remove="handleRemove" :on-remove="handleRemove"
> >
<!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> --> <!-- <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-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -318,6 +344,7 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="noticeOpen" :visible.sync="noticeOpen"
v-if="noticeOpen"
width="1000px" width="1000px"
append-to-body append-to-body
> >
@ -773,6 +800,11 @@ export default {
//添加人员 //添加人员
addUser() { addUser() {
// console.log(this.chosenUserList,"chosenUserList") // console.log(this.chosenUserList,"chosenUserList")
if (this.chosenUserList.length < 1) {
this.$message.error('请选择添加的人员！')
return
}
addNoticeUser(this.chosenUserList).then((response) => { addNoticeUser(this.chosenUserList).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.getNoticeUserList() this.getNoticeUserList()
@ -876,13 +908,13 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
// console.log(this.form)
this.form.checkUrl = this.checkUrlList.join(',') this.form.checkUrl = this.checkUrlList.join(',')
this.form.checkUrlName = this.checkUrlNameList.join(',') this.form.checkUrlName = this.checkUrlNameList.join(',')
let equipments = [this.form] // console.log(this.form)
console.log(equipments) // console.log(equipments)
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
let equipments = [this.form]
updatePurchaseCheckDetails(equipments).then((response) => { updatePurchaseCheckDetails(equipments).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$message({ this.$message({
@ -900,9 +932,12 @@ export default {
}) })
}, },
submitListForm: function () { submitListForm: function () {
// console.log(this.aform)
this.aform.checkUrl = this.checkUrlList1.join(',') this.aform.checkUrl = this.checkUrlList1.join(',')
this.aform.checkUrlName = this.checkUrlNameList1.join(',') this.aform.checkUrlName = this.checkUrlNameList1.join(',')
// console.log(this.aform)
// console.log(equipments)
this.$refs['aform'].validate((valid) => {
if (valid) {
this.ids.forEach((item) => { this.ids.forEach((item) => {
item.checkNum = item.purchaseNum item.checkNum = item.purchaseNum
item.checkResult = this.aform.checkResult item.checkResult = this.aform.checkResult
@ -911,9 +946,6 @@ export default {
}) })
// console.log(this.ids) // console.log(this.ids)
let equipments = this.ids let equipments = this.ids
console.log(equipments)
this.$refs['aform'].validate((valid) => {
if (valid) {
updatePurchaseCheckDetails(equipments).then((response) => { updatePurchaseCheckDetails(equipments).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$message({ this.$message({
@ -1034,4 +1066,15 @@ export default {
display: none; display: none;
} }
} }
.img-box {
margin-right: 8px;
}
.img-box:last-child {
margin: 0;
}
.el-upload__tip {
font-size: 14px;
color: red;
}
</style> </style>

28
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -9,7 +9,6 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="设备类型" prop="typeId"> <el-form-item label="设备类型" prop="typeId">
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
@ -198,9 +197,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if=" v-if="scope.row.taskStatus == '105'"
scope.row.taskStatus == '105'
"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['warehousing:newTools:auditing']" v-hasPermi="['warehousing:newTools:auditing']"
>审核</el-button >审核</el-button
@ -209,7 +206,10 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" 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)" @click="handlePrint(scope.row)"
v-hasPermi="['warehousing:newTools:list']" v-hasPermi="['warehousing:newTools:list']"
>入库单</el-button >入库单</el-button
@ -230,6 +230,7 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
v-if="open"
width="1000px" width="1000px"
append-to-body append-to-body
> >
@ -384,7 +385,8 @@
size="mini" size="mini"
type="text" type="text"
v-if=" v-if="
(scope.row.status == '0' || scope.row.status == '3') && (scope.row.status == '0' ||
scope.row.status == '3') &&
scope.row.userIds.includes(userId) scope.row.userIds.includes(userId)
" "
@click="pass(scope.row)" @click="pass(scope.row)"
@ -394,7 +396,8 @@
size="mini" size="mini"
type="text" type="text"
v-if=" v-if="
(scope.row.status == '0' || scope.row.status == '3') && (scope.row.status == '0' ||
scope.row.status == '3') &&
scope.row.userIds.includes(userId) scope.row.userIds.includes(userId)
" "
@click="refused(scope.row)" @click="refused(scope.row)"
@ -877,6 +880,17 @@ export default {
) )
}, },
}, },
watch: {
open: {
handler(newValue) {
if (!newValue) {
this.query.dictName = ''
}
},
deep: true,
},
},
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

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

@ -44,10 +44,10 @@ module.exports = {
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.60:28080`, //超 // 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.74:8080`,//旭/
// target: `http://10.40.92.140:28080`, //帅 // target: `http://10.40.92.140:28080`, //帅
target: `http://10.40.92.253:28080`, //福 // target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;