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

Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

Browse Source
dev2.5_scan
wangwei 4 days ago
parent 80ee546bdd b0463f5100
commit 29291397a3
2 changed files with 83 additions and 38 deletions
Show Stats Download Patch File Download Diff File

45
src/views/basic/product/drug/drugAdd.vue
Unescape Escape View File

@ -481,7 +481,47 @@
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="无码类型:" prop="notCodeType">
<el-select v-model="newProductData.notCodeType" style="width: 90%" placeholder="选择无码类型">
<el-option label="不是无码类型" :value="0"></el-option>
<el-option label="部分早期未赋予追溯码" :value="1"></el-option>
<el-option label="最小包装无追溯码" :value="5"></el-option>
<el-option label="无追溯码" :value="6"></el-option>
<el-option label="其他原因" :value="7"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="药品售价:" prop="drugSellingPrice">
<el-input style="width: 90%" size="small" placeholder="请输入药品售价"
v-model.trim="newProductData.drugSellingPrice"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="售价开始时间:" prop="drugSellingPriceTime">
<el-date-picker clearable size="small"
v-model="newProductData.drugSellingPriceTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="是否挂网:" prop="hangingNetType">
<el-select v-model="newProductData.hangingNetType" style="width: 90%" placeholder="选择是否挂网">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="23" class="el-col">
<el-form-item label="产品描述:" prop="cpms">
@ -695,8 +735,9 @@ export default {
distributeLevel: null,
useLevel: null,
majorStatus: 1,
physicType: 3
physicType: 3,
notCodeType: 1,
hangingNetType: 1
},
thirdSys: [],
classifyList: [],

76
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -173,14 +173,15 @@
width="25%"
:close-on-click-modal="false"
:close-on-press-escape="false"
:custom-class="'compact-dialog'"
center
>
<div style="text-align: center">
<i class="el-icon-warning" style="font-size: 36px; color: #E6A23C; margin-bottom: 12px;"></i>
<div style="display: flex; align-items: center; justify-content: center; text-align: center;">
<i class="el-icon-warning" style="font-size: 36px; color: #E6A23C; margin-right: 12px;"></i>
<p style="font-size: 14px; margin: 0;">{{ confirmMessage }}</p>
</div>
<span slot="footer" class="dialog-footer" style="padding: 10px 20px;">
<el-button size="small" @click="confirmDialogVisible = false">取消</el-button>
<span slot="footer" class="dialog-footer">
<el-button size="small" plain @click="confirmDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
</span>
</el-dialog>
@ -348,7 +349,7 @@ export default {
},
curRow: null,
panelALive: false,
autoFinishOrderFlag: true,//是否对完成的单据提示立即提交
autoFinishOrderFlag: false,//是否对完成的单据提示立即提交
//扫码相关
scanCode: '',
@ -813,18 +814,18 @@ export default {
this.placeholder = '已选入单据，请扫UDI码进行作业'
this.getBillNo(this.formData.billNo)
this.startDeal()
} else {
this.scanCode = ''
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: (action) => {
this.$refs.inputRef.focus()
this.$refs.inputRef.select()
}
})
this.$message.error(response.message)
// this.$alert(response.message, '提示', {
// confirmButtonText: '确定',
// type: 'warning',
// closeOnClickModal: true,
// callback: (action) => {
// this.$refs.inputRef.focus()
// this.$refs.inputRef.select()
// }
// })
}
}
this.loading = false
@ -895,15 +896,16 @@ export default {
} else {
this.scanCode = ''
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: (action) => {
this.$refs.inputRef.focus()
this.$refs.inputRef.select()
}
})
this.$message.error(response.message)
// this.$alert(response.message, '提示', {
// confirmButtonText: '确定',
// type: 'warning',
// closeOnClickModal: true,
// callback: (action) => {
// this.$refs.inputRef.focus()
// this.$refs.inputRef.select()
// }
// })
}
}
this.loading = false
@ -953,8 +955,6 @@ export default {
this.$refs.inputRef.focus()
this.$message.error(res.message)
}
}
}).catch(() => {
this.loading = false
@ -1016,7 +1016,6 @@ export default {
finishOrder() {
// 显示加载状态
finishOrder(this.formData).then(res => {
const loading = this.$loading({
lock: true,
@ -1238,27 +1237,24 @@ export default {
if (!this.autoFinishOrderFlag) {
return
}
if (this.formDataVisible.scanType == 1) {
return
}
vailOrderFinish(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
if (res.data) {
this.$confirm('单据已赋码或可自动赋码，是否立即完成单据？', '提示', {
confirmButtonText: '立即提交',
cancelButtonText: '手动扫码',
type: 'warning'
}).then(() => {
this.confirmMessage = '单据已赋码或可自动赋码，是否立即完成单据？'
this.confirmCallback = () => {
this.finishOrder()
}).catch(() => {
}
this.confirmDialogVisible = true
this.$once('hook:beforeDestroy', () => {
this.autoFinishOrderFlag = false
})
}
} else {
this.autoFinishOrderFlag = false
}
}).catch(() => {
this.loading = false
@ -1805,4 +1801,12 @@ export default {
margin-left: 20px;
margin-right: 10px;
}
.no-enter-dialog {
pointer-events: auto !important;
}
.no-enter-dialog .el-message-box__btns .el-button {
pointer-events: auto !important;
}
</style>

Write Preview
Loading…
Cancel
Save