From 58be07dbde1f3375d86204cb215c8372b615a01b Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期三, 09 四月 2025 10:16:53 +0800 Subject: [PATCH] 原辅材车间文件预览调整+成品分配权限限制 --- src/views/business/materialOrder/customsInspection.vue | 10 +++++++--- src/views/business/productOrder/components/issuedDialog.vue | 2 +- src/views/structural/capabilityAndLaboratory/workshop/components/fileList.vue | 17 ++++++++++++++--- src/views/business/inspectionTask/index.vue | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue index aa138cb..04d6c71 100644 --- a/src/views/business/inspectionTask/index.vue +++ b/src/views/business/inspectionTask/index.vue @@ -56,7 +56,7 @@ scope.row.insState == 5 || scope.row.insState == 3 || (scope.row.userName && !scope.row.userName.includes(nickName)) - )" @click="handleConnect(scope.row)">浜ゆ帴</el-button> + )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">浜ゆ帴</el-button> <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button> <el-popover placement="bottom" trigger="hover" style="margin-left: 6px"> <template #reference> diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue index a60f62d..a33ebbc 100644 --- a/src/views/business/materialOrder/customsInspection.vue +++ b/src/views/business/materialOrder/customsInspection.vue @@ -172,12 +172,16 @@ <i class="el-icon-document"></i> 杞﹂棿闄勪欢鏌ョ湅 </el-button> - <el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%"> - <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" /> - </el-dialog> </el-form-item> </el-form> </div> + <el-button type="text" @click="handleFileDialog" v-show="active != 1"> + <i class="el-icon-document"></i> + 杞﹂棿闄勪欢鏌ョ湅 + </el-button> + <el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%"> + <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" :isLook="true" /> + </el-dialog> <div style="margin-bottom: 6px;margin-top: 6px"> <el-button v-show="active == 1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button> diff --git a/src/views/business/productOrder/components/issuedDialog.vue b/src/views/business/productOrder/components/issuedDialog.vue index 484a3f4..0984054 100644 --- a/src/views/business/productOrder/components/issuedDialog.vue +++ b/src/views/business/productOrder/components/issuedDialog.vue @@ -18,7 +18,7 @@ <el-table-column label="鍒嗛厤浜哄憳" prop="checkUserId"> <template slot-scope="scope"> <el-select v-model="scope.row.checkUserId" clearable filterable placeholder="璇烽�夋嫨" size="small" - style="width: 100%;"> + style="width: 100%;" :disabled="scope.row.insResult !== null"> <el-option v-for="(item, i) in personList" :key="i + 'gbnm.'" :label="item.label" :value="item.value"> </el-option> </el-select> diff --git a/src/views/structural/capabilityAndLaboratory/workshop/components/fileList.vue b/src/views/structural/capabilityAndLaboratory/workshop/components/fileList.vue index 6cdd690..476d257 100644 --- a/src/views/structural/capabilityAndLaboratory/workshop/components/fileList.vue +++ b/src/views/structural/capabilityAndLaboratory/workshop/components/fileList.vue @@ -4,7 +4,7 @@ <el-upload ref='upload' :action="fileAction" :auto-upload="true" :before-upload="fileBeforeUpload" :data="{ id: currentId }" :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false" accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' - style="width: 80px !important;"> + style="width: 80px !important;" v-if="!isLook"> <el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button> </el-upload> </div> @@ -26,7 +26,16 @@ limsTable, filePreview, }, - props: ['currentId'], + props: { + currentId: { + type: String, + default: '' + }, + isLook: { + type: Boolean, + default: false + } + }, computed: { fileAction() { return this.javaApi + '/workShop/uploadFile' @@ -79,13 +88,15 @@ type: 'text', clickFun: (row) => { this.delete(row); + }, + showHide: (row) => { + return !this.isLook } }, { name: '棰勮', type: 'text', clickFun: (row) => { - console.log('棰勮鏂囦欢淇℃伅:', row) this.currentInfo = row this.lookDialogVisible = true } -- Gitblit v1.9.3