UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

12/26 选入添加计量单位

Browse Source
dev_unify
wangwei 6 months ago
parent 2f3d9d6684
commit 735f0c7e18
3 changed files with 178 additions and 131 deletions
Show Stats Download Patch File Download Diff File

218
src/views/pharmaceuticals/distribution/DialogCheck.vue
Unescape Escape View File

@ -2,20 +2,20 @@
<div> <div>
<el-form :model="inputQuery" :rules="formRules" ref="dataForm"> <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
<el-card style="margin-top: -30px"> <el-card style="margin-top: -30px">
<el-button-group style="display: flex"> <!--<el-button-group style="display: flex">-->
<el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px" <!-- <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"-->
:loading="loading">提交 <!-- :loading="loading">提交-->
</el-button> <!-- </el-button>-->
</el-button-group> <!--</el-button-group>-->
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>规格型号：</span> <span>包装规格：</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name"> <el-form-item prop="name">
<el-input v-model="inputQuery.spec" auto-complete="off" :disabled="true"></el-input> <el-input v-model="inputQuery.bzgg" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -123,108 +123,108 @@
</el-row> </el-row>
<el-row> <!--<el-row>-->
<el-col :span="3"> <!-- <el-col :span="3">-->
<div class="ao-text"> <!-- <div class="ao-text">-->
<span>检验报告上传：</span> <!-- <span>检验报告上传：</span>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item> <!-- <el-form-item>-->
<el-upload <!-- <el-upload-->
:disabled="formData.auditStatus == 1" <!-- :disabled="formData.auditStatus == 1"-->
class="upload-demo" <!-- class="upload-demo"-->
ref="upload" <!-- ref="upload"-->
:action="this.uploadUrl" <!-- :action="this.uploadUrl"-->
:on-preview="uploadHandlePreview" <!-- :on-preview="uploadHandlePreview"-->
:on-remove="uploadHandleRemove" <!-- :on-remove="uploadHandleRemove"-->
:limit="1" <!-- :limit="1"-->
:headers="headers" <!-- :headers="headers"-->
:on-exceed="uploadHandleExceed" <!-- :on-exceed="uploadHandleExceed"-->
accept=".jpg,.png,.pdf" <!-- accept=".jpg,.png,.pdf"-->
:on-change="uploadOnchange" <!-- :on-change="uploadOnchange"-->
:on-success="uploadHandleSuccess" <!-- :on-success="uploadHandleSuccess"-->
:on-error="uploadHandleError" <!-- :on-error="uploadHandleError"-->
:on-before="uploadHandleBefore" <!-- :on-before="uploadHandleBefore"-->
:file-list="fileList" <!-- :file-list="fileList"-->
:data="{type:'image2'}" <!-- :data="{type:'image2'}"-->
:auto-upload="true"> <!-- :auto-upload="true">-->
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1"> <!-- <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
{{ choiceFile }} <!-- {{ choiceFile }}-->
</el-button> <!-- </el-button>-->
<div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div> <!-- <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>-->
</el-upload> <!-- </el-upload>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="3"> <!-- &lt;!&ndash;<el-col :span="3">&ndash;&gt;-->
<div class="ao-text" v-if="this.inputQuery.filePath!=null"> <!-- &lt;!&ndash; <div class="ao-text" v-if="this.inputQuery.filePath!=null">&ndash;&gt;-->
<span>检验报告预览：</span> <!-- &lt;!&ndash; <span>检验报告预览：</span>&ndash;&gt;-->
</div> <!-- &lt;!&ndash; </div>&ndash;&gt;-->
</el-col> <!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
<el-col :span="8"> <!-- &lt;!&ndash;<el-col :span="8">&ndash;&gt;-->
<el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null" <!-- &lt;!&ndash; <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"&ndash;&gt;-->
style="text-align:right" @click="showImgViewer"> <!-- &lt;!&ndash; style="text-align:right" @click="showImgViewer">&ndash;&gt;-->
检验报告预览 <!-- &lt;!&ndash; 检验报告预览&ndash;&gt;-->
</el-button> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" <!-- &lt;!&ndash; <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"&ndash;&gt;-->
:url-list="imgList"/> <!-- &lt;!&ndash; :url-list="imgList"/>&ndash;&gt;-->
</el-col> <!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
</el-row> <!--</el-row>-->
<el-row> <!--<el-row>-->
<el-col :span="3"> <!-- <el-col :span="3">-->
<div class="ao-text"> <!-- <div class="ao-text">-->
<span>冷链报告上传：</span> <!-- <span>冷链报告上传：</span>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item> <!-- <el-form-item>-->
<el-upload <!-- <el-upload-->
:disabled="formData.auditStatus == 1" <!-- :disabled="formData.auditStatus == 1"-->
class="upload-demo" <!-- class="upload-demo"-->
ref="upload" <!-- ref="upload"-->
:action="this.uploadUrl" <!-- :action="this.uploadUrl"-->
:on-preview="uploadHandlePreview" <!-- :on-preview="uploadHandlePreview"-->
:on-remove="uploadHandleRemove1" <!-- :on-remove="uploadHandleRemove1"-->
:limit="1" <!-- :limit="1"-->
:headers="headers" <!-- :headers="headers"-->
:on-exceed="uploadHandleExceed" <!-- :on-exceed="uploadHandleExceed"-->
accept=".jpg,.png,.pdf" <!-- accept=".jpg,.png,.pdf"-->
:on-change="uploadOnchange1" <!-- :on-change="uploadOnchange1"-->
:on-success="uploadHandleSuccess1" <!-- :on-success="uploadHandleSuccess1"-->
:on-error="uploadHandleError" <!-- :on-error="uploadHandleError"-->
:on-before="uploadHandleBefore" <!-- :on-before="uploadHandleBefore"-->
:file-list="fileList" <!-- :file-list="fileList"-->
:data="{type:'image2'}" <!-- :data="{type:'image2'}"-->
:auto-upload="true"> <!-- :auto-upload="true">-->
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1"> <!-- <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
{{ choiceFile1 }} <!-- {{ choiceFile1 }}-->
</el-button> <!-- </el-button>-->
<div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div> <!-- <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>-->
</el-upload> <!-- </el-upload>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="3"> <!-- &lt;!&ndash;<el-col :span="3">&ndash;&gt;-->
<div class="ao-text" v-if="this.inputQuery.coldFilePath!=null"> <!-- &lt;!&ndash; <div class="ao-text" v-if="this.inputQuery.coldFilePath!=null">&ndash;&gt;-->
<span>冷链报告预览：</span> <!-- &lt;!&ndash; <span>冷链报告预览：</span>&ndash;&gt;-->
</div> <!-- &lt;!&ndash; </div>&ndash;&gt;-->
</el-col> <!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
<el-col :span="8"> <!-- &lt;!&ndash;<el-col :span="8">&ndash;&gt;-->
<el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.coldFilePath!=null" <!-- &lt;!&ndash; <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.coldFilePath!=null"&ndash;&gt;-->
style="text-align:right" @click="showImgViewerCold"> <!-- &lt;!&ndash; style="text-align:right" @click="showImgViewerCold">&ndash;&gt;-->
冷链报告预览 <!-- &lt;!&ndash; 冷链报告预览&ndash;&gt;-->
</el-button> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/> <!-- &lt;!&ndash; <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>&ndash;&gt;-->
</el-col> <!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
</el-row> <!--</el-row>-->

2
src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue
Unescape Escape View File

@ -953,7 +953,7 @@
<el-dialog <el-dialog
title="检验报告" title="单据详情"
:visible.sync="Upinvoice" :visible.sync="Upinvoice"
:before-close="freshen" :before-close="freshen"
width="60%" width="60%"

87
src/views/supplier/companyDrug/basicCompanyProductsImport.vue
Unescape Escape View File

@ -239,6 +239,7 @@
<!--</el-row>--> <!--</el-row>-->
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="商品条码" prop="sptm"> <el-form-item label="商品条码" prop="sptm">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码"
@ -320,13 +321,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位" prop="measname">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.measname"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -452,13 +447,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="商品条码:" prop="cpmctymc">
<el-input style="width: 90%" size="small" placeholder="请输入内容"
v-model.trim="repEditQuery.sptm"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="11" class="el-col">--> <!--<el-col :span="11" class="el-col">-->
<!-- <el-form-item label="耗材材质:" prop="matrial">--> <!-- <el-form-item label="耗材材质:" prop="matrial">-->
<!-- <el-input style="width: 90%" size="small" placeholder="请输入内容"--> <!-- <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
@ -473,7 +462,31 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="distributeLevel" >
<el-select v-model="repEditQuery.distributeLevel" size="small" style="width: 90%"
placeholder="请选择计量单位"
>
<el-option
v-for="item in levelUnitList"
:key="item.packLevel"
:value="item.packLevel"
:label="item.packUnit"
>
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
<span style="float: left">层级:{{ item.packLevel }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="计量单位" prop="measname">-->
<!-- <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
<!-- v-model="editQuery.measname"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
@ -525,13 +538,21 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="measname"> <el-form-item label="商品条码:" prop="cpmctymc">
<el-input style="width: 90%" size="small" placeholder="请输入内容" <el-input style="width: 90%" size="small" placeholder="请输入内容"
v-model.trim="repEditQuery.measname" v-model.trim="repEditQuery.sptm"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="11" class="el-col">-->
<!-- <el-form-item label="计量单位:" prop="measname">-->
<!-- <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
<!-- v-model.trim="repEditQuery.measname"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
@ -836,6 +857,7 @@ import { isBlank } from '@/utils/strUtil'
import { getHslbs, getThrProductType } from '@/api/thrsys/thrHsfl' import { getHslbs, getThrProductType } from '@/api/thrsys/thrHsfl'
import { filterClassify } from '@/api/purchase/classifyCode' import { filterClassify } from '@/api/purchase/classifyCode'
import { executeFuc, getHead } from '@/utils/customConfig' import { executeFuc, getHead } from '@/utils/customConfig'
import { levelByUuid } from '@/api/basic/product/udiInfo'
export default { export default {
name: 'UdIInfoSelect', name: 'UdIInfoSelect',
@ -915,7 +937,8 @@ export default {
flbm: null, flbm: null,
requireScanCode: null, requireScanCode: null,
ggxh: null, ggxh: null,
detailSort: null detailSort: null,
distributeLevel: null,
}, },
relevanceEdit: { relevanceEdit: {
@ -959,13 +982,18 @@ export default {
detailSort: [ detailSort: [
{ required: true, message: '请选择明细分类', trigger: 'blur' } { required: true, message: '请选择明细分类', trigger: 'blur' }
],
distributeLevel: [
{ required: true, message: '请选择计量单位', trigger: 'blur' }
] ]
// useMaxLevel: [ // useMaxLevel: [
// {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'} // {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
// ], // ],
}, },
//是否以89开头 //是否以89开头
isSpecial: false isSpecial: false,
levelUnitList: [],
} }
}, },
@ -1140,7 +1168,7 @@ export default {
this.loading = false this.loading = false
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success(response.data) this.$message.success(response.data)
this.$emit('closeSelDialog', true) // this.$emit('closeSelDialog', true)
this.closeSelDialog() this.closeSelDialog()
} else { } else {
this.$message.error(response.message) this.$message.error(response.message)
@ -1210,6 +1238,7 @@ export default {
if (!isBlank(this.currentRow.nameCode) && this.currentRow.nameCode.startsWith('89')) { if (!isBlank(this.currentRow.nameCode) && this.currentRow.nameCode.startsWith('89')) {
this.isSpecial = true this.isSpecial = true
} }
this.getDiLevel(selection.id)
this.replTitle = '(' + this.currentRow.cpmctymc + ')' + '药品信息补齐:' this.replTitle = '(' + this.currentRow.cpmctymc + ')' + '药品信息补齐:'
this.repEditQuery.sptm = this.currentRow.sptm this.repEditQuery.sptm = this.currentRow.sptm
this.repEditQuery.ybbm = this.currentRow.ybbm this.repEditQuery.ybbm = this.currentRow.ybbm
@ -1226,8 +1255,11 @@ export default {
this.repEditQuery.zczbhhzbapzbh = this.currentRow.zczbhhzbapzbh this.repEditQuery.zczbhhzbapzbh = this.currentRow.zczbhhzbapzbh
this.repEditQuery.packMatrial = this.currentRow.packMatrial this.repEditQuery.packMatrial = this.currentRow.packMatrial
this.repEditQuery.measname = this.currentRow.measname this.repEditQuery.measname = this.currentRow.measname
this.repEditQuery.distributeLevel = this.currentRow.distributeLevel
this.getYbHcData() this.getYbHcData()
this.classifySearch() this.classifySearch()
// if (isBlank(this.relevanceEdit.cpms)) { // if (isBlank(this.relevanceEdit.cpms)) {
// this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh // this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
// } // }
@ -1382,13 +1414,28 @@ export default {
.catch(() => { .catch(() => {
this.loading = false this.loading = false
}) })
},
getDiLevel(rlId) {
let query = {
id: rlId
} }
this.loading = true
levelByUuid(query)
.then((response) => {
this.loading = false
this.levelUnitList = response.data || []
// this.findMaxLevelObject()
})
.catch(() => {
this.loading = false
this.levelUnitList = []
})
},
}, },
mounted() { mounted() {
}, },
components: {}, components: {},
created() { created() {
console.log('jsjjsjjsjsj', this.productIds)
getHead('basicCompanyProductsImport', '1').then((re) => { getHead('basicCompanyProductsImport', '1').then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data this.tableObj = re.data

Write Preview
Loading…
Cancel
Save