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

新购模块测试问题修改

This commit is contained in:
zzyuan 2024-12-03 10:18:11 +08:00
parent 74a0d87455
commit ac9dc6b851
5 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/material/purchase/goodsAccept/detail.vue
View File

@ -201,7 +201,7 @@
prop="checkResult" prop="checkResult"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)"> <el-button size="mini" type="success" @click="pass(scope.row)">
合格 合格
@ -268,31 +268,19 @@
<el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> --> <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div style="display: flex;align-items: center;justify-content: center;">
style=" <el-upload ref="upload" :limit="3" :headers="upload.headers"
display: flex; :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
align-items: center; :on-success="handleFileSuccess" :auto-upload="true"
justify-content: center;
"
>
<!-- <el-upload ref="upload" :limit="1" :headers="upload.headers" v-show="!isView"
:action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
:on-success="handleFileSuccess" :auto-upload="true"
> >
<el-button size="mini" type="text" @click="beforeFileUpload(scope.row)"> <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)" v-if="!isView">
上传 上传
</el-button> </el-button>
</el-upload> --> </el-upload>
<el-button <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" style="margin-left: 10px;">
size="mini" 查看
type="text" </el-button>
@click="picturePreview(scope.row)"
v-if="scope.row.url"
style="margin-left: 10px"
>
查看
</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

2
src/views/material/purchase/goodsArrived/component/addTools.vue
View File

@ -269,7 +269,7 @@
</el-button> </el-button>
</el-upload> </el-upload>
<el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url"> <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" style="margin-left: 20px;">
查看 查看
</el-button> </el-button>
</div> </div>

27
src/views/material/purchase/goodsBind/component/bindTools.vue
View File

@ -18,7 +18,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="机具厂家" prop="typeId"> <!-- <el-form-item label="机具厂家" prop="typeId">
<el-select <el-select
clearable clearable
filterable filterable
@ -33,7 +33,7 @@
v-for="m in millList" v-for="m in millList"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="出厂日期" prop="productDate"> <el-form-item label="出厂日期" prop="productDate">
<el-date-picker <el-date-picker
type="date" type="date"
@ -65,6 +65,7 @@
type="danger" type="danger"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleBackAll" @click="handleBackAll"
v-if="!isView"
> >
驳回 驳回
</el-button> </el-button>
@ -76,7 +77,7 @@
:data="codeList" :data="codeList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" v-if="!isView"/>
<el-table-column align="center" label="序号" type="index" width="55" /> <el-table-column align="center" label="序号" type="index" width="55" />
<el-table-column <el-table-column
align="center" align="center"
@ -140,7 +141,7 @@
> >
查看 查看
</el-button> </el-button>
<el-button plain size="mini" type="warning" @click="handleBind(row)"> <el-button plain size="mini" type="warning" @click="handleBind(row)" v-if="!isView">
<svg-icon icon-class="bind-icon" /> <svg-icon icon-class="bind-icon" />
绑定 绑定
</el-button> </el-button>
@ -149,6 +150,7 @@
type="danger" type="danger"
icon="el-icon-close" icon="el-icon-close"
@click="handleReject(row)" @click="handleReject(row)"
v-if="!isView"
> >
驳回 驳回
</el-button> </el-button>
@ -335,22 +337,17 @@
<el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> --> <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div style="display: flex;align-items: center;justify-content: space-between;">
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="3"
:headers="upload.headers" :headers="upload.headers"
:action="upload.url" :action="upload.url"
:show-file-list="false" :show-file-list="false"
accept=".png, .jpg, .jpeg, .pdf, .doc, .docx" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
:on-success="handleFileSuccess" :on-success="handleFileSuccess"
:auto-upload="true" :auto-upload="true"
v-if="!isView"
> >
<el-button <el-button
size="mini" size="mini"
@ -416,6 +413,12 @@ export default {
type: Number, type: Number,
default: () => 1, default: () => 1,
}, },
isView: {
type: Boolean,
default: () => {
return false
},
},
}, },
data() { data() {
return { return {

6
src/views/material/purchase/goodsBind/index.vue
View File

@ -10,6 +10,7 @@
<component <component
:queryId="queryId" :queryId="queryId"
:is="isShowComponent" :is="isShowComponent"
:isView="isView"
:queryType="queryType" :queryType="queryType"
:queryTaskId="queryTaskId" :queryTaskId="queryTaskId"
@openBindTools="openBindTools" @openBindTools="openBindTools"
@ -35,6 +36,7 @@ export default {
queryTaskId: '', // 二级页面查询 taskId queryTaskId: '', // 二级页面查询 taskId
queryId: '', // 二级页面查询 id queryId: '', // 二级页面查询 id
isShowComponent: 'Home', isShowComponent: 'Home',
isView: false,
} }
}, },
@ -45,12 +47,12 @@ export default {
this.queryType = type this.queryType = type
this.queryTaskId = taskId this.queryTaskId = taskId
if (type === 1) { if (type === 1) {
// 查看逻辑 this.isView = true
this.pageContent = '查看' this.pageContent = '查看'
this.isShowComponent = 'BindTools' this.isShowComponent = 'BindTools'
} }
if (type === 2) { if (type === 2) {
// 编码逻辑 this.isView = false
this.pageContent = '编码绑定' this.pageContent = '编码绑定'
this.isShowComponent = 'BindTools' this.isShowComponent = 'BindTools'
} }

4
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -75,7 +75,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/> <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/> -->
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
</el-table-column> </el-table-column>
@ -149,7 +149,7 @@
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<el-upload ref="upload" :limit="1" :headers="upload.headers" v-show="!isView" <el-upload ref="upload" :limit="3" :headers="upload.headers" v-if="!isView"
:action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx" :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
:on-success="handleFileSuccess" :auto-upload="true" :on-success="handleFileSuccess" :auto-upload="true"
> >