12/3 代码备份 选入阿里单据 发票修改

dev_unify
wangwei 7 months ago
parent f3b5160339
commit 2faeba9fc7

@ -205,6 +205,7 @@ import {enterCodeWeb} from "@/api/inout/order";
import {addRelCode, scanCodeRelCode, deleteDetail, deleteAllDetail} from "@/api/collect/relCode";
import sonRelCode from './sonRelCode.vue';
import A from "@/plugins/KeyScaner";
import { isBlank } from '@/utils/strUtil'
export default {
name: "operateRelCode",
@ -425,6 +426,13 @@ export default {
this.relFormData.workShop = data.workShop;
this.relFormData.lineName = data.lineName;
this.relFormData.lineManager = data.lineManager;
// if (!isBlank(data.batchNo)){
// this.relFormData.batchNo = data.batchNo
// this.relFormData.madeDate = data.madeDate
// this.relFormData.validateDate = data.validateDate
// this.detailList = data.detailList
// this.syxjsl = data.syxjsl
// }
this.parentCode = data.curCode;
this.bhxjsl = data.bhxjsl;

@ -155,99 +155,99 @@
</el-card>
</el-form>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ input.billNo }}-单据详情</span>
<el-table
v-loading="bizDetailLoading"
:data="codeDetailList"
style="width: 100%"
border
@current-change="BizDetailInv"
@selection-change="handleSelectionUdiChange"
row-key="id"
highlight-current-row
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码"
prop="invoiceCodes"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
width="150"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
width="100"
prop="batchNo"
></el-table-column>
<el-table-column
label="数量"
prop="count"
width="100"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="100"
></el-table-column>
<!--<el-tabs type="border-card" style="margin: 15px">-->
<!-- &lt;!&ndash;单据业务详情&ndash;&gt;-->
<!-- <el-tab-pane>-->
<!-- <span slot="label">单据 {{ input.billNo }}-单据详情</span>-->
<!-- <el-table-->
<!-- v-loading="bizDetailLoading"-->
<!-- :data="codeDetailList"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- @current-change="BizDetailInv"-->
<!-- @selection-change="handleSelectionUdiChange"-->
<!-- row-key="id"-->
<!-- highlight-current-row-->
<!-- >-->
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
<!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column-->
<!-- label="发票编码"-->
<!-- prop="invoiceCodes"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="物资名称"-->
<!-- prop="coName"-->
<!-- width="150"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="规格型号"-->
<!-- width="150"-->
<!-- prop="spec"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="批次号"-->
<!-- width="100"-->
<!-- prop="batchNo"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="数量"-->
<!-- prop="count"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="扫码数量"-->
<!-- prop="reCount"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="价格"-->
<!-- prop="price"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<el-table-column
label="金额"
prop="amount"
width="100"
></el-table-column>
<!-- <el-table-column-->
<!-- label="金额"-->
<!-- prop="amount"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<el-table-column
label="生产日期"
prop="productDate"
width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="codeTotal > 0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailLists"
/>
</el-tab-pane>
</el-tabs>
<!-- <el-table-column-->
<!-- label="生产日期"-->
<!-- prop="productDate"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="失效日期"-->
<!-- prop="expireDate"-->
<!-- width="100"-->
<!-- ></el-table-column>-->
<!-- <el-table-column width="100" label="计量单位" prop="measname">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="生产企业"-->
<!-- prop="manufacturer"-->
<!-- width="160"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="注册/备案号"-->
<!-- width="160"-->
<!-- prop="certCode"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- v-show="codeTotal > 0"-->
<!-- :total="codeTotal"-->
<!-- :page.sync="codeQuery.page"-->
<!-- :limit.sync="codeQuery.limit"-->
<!-- @pagination="getCodeDetailLists"-->
<!-- />-->
<!-- </el-tab-pane>-->
<!--</el-tabs>-->
<el-image-viewer
v-if="imgViewerVisible"
style="z-index: 9999"
@ -306,7 +306,7 @@ export default {
data() {
return {
idList: [],
invoiceRow: [],
// invoiceRow: [],
statusCode: null,
choiceFile: "选取文件",
fileList: [],
@ -482,10 +482,10 @@ export default {
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
methods: {
onSubmit() {
if (this.invoiceRow == null|| this.invoiceRow.length === 0) {
this.$message.error("请选择要登记的物资! ");
return false;
}
// if (this.invoiceRow == null|| this.invoiceRow.length === 0) {
// this.$message.error("! ");
// return false;
// }
if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error("发票编码不能为空!");
return;
@ -537,7 +537,10 @@ export default {
});
//
updateorderBiz(this.inputQuery.list).then((res) => {
let query = {
list : this.inputQuery.list
}
updateorderBiz(query).then((res) => {
this.closeDialog();
});
},

@ -794,11 +794,13 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="checkInvoice"
@close="closecheckInvoice"
>
<checkInvoice
:closeDialog="closecheckInvoice"
:input="inputInv"
:getOrderDetails="getOrderDetails"
:invoiceRow="detailList"
></checkInvoice>
</el-dialog>
@ -1061,6 +1063,7 @@ export default {
acceptQuery: null,
acceptOrderVisible: false,
subRow: null,
detailList:[],
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@ -1090,11 +1093,13 @@ export default {
this.getList();
},
InvoiceRegister1(_this,row) {
_this.savebillno = row.billNo
_this.savebillno = _this.currentRow.billNo
_this.inputInv = row;
_this.detailList.push(row)
_this.checkInvoice = true;
},
closecheckInvoice() {
this.detailList = []
this.checkInvoice = false;
this.getList();
this.currentRow.billNo = this.savebillno;

@ -5,6 +5,10 @@
style="margin-bottom: -15px">
<el-button-group
style="display: flex; margin: 0px 0 15px 75%; height: 35px">
<el-button size="mini" type="primary" @click.native="selectOrder()"
v-if="curAction.checkWebNew != 2 || viewType !=1"
>选入阿里单据
</el-button>
<el-button
size="mini"
type="primary"
@ -236,6 +240,19 @@
</editCodeDialog>
</el-dialog>
<el-dialog
title="选入阿里单据"
:visible.sync="selectOrderVisible"
append-to-body width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectOrderVisible">
<selectMsfxOrderDialog>
</selectMsfxOrderDialog>
</el-dialog>
</div>
</template>
@ -254,6 +271,7 @@ import {selectAuthMenuByMenuKeys} from '@/api/system/sysMenuHelp'
import codesPanel from "./PanelCreateOrderCodes"
import codeDetailPanel from "./PanelCreateOrderCodeDetail"
import bizDetailPanel from "./PanelCreateOrderBizDetail"
import selectMsfxOrderDialog from "./selectMsfxOrderDialog"
import A from "@/plugins/KeyScaner"
import {findByInvUser, getLocalJoinByUser, getBusTypeList} from '@/api/basic/busType'
import {deleteRe} from "@/api/auth/register";
@ -347,6 +365,7 @@ export default {
editCodeVisible: false,
actionEnable: false,
editOriginCodeVisible: false,
selectOrderVisible:false,
curId: null,
storageList: [],
@ -394,7 +413,7 @@ export default {
};
},
components: {
codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog,selectMsfxOrderDialog
},
methods: {
//url
@ -846,9 +865,12 @@ export default {
}
this.loading = false;
});
}
,
},
//msfx
selectOrder(){
this.selectOrderVisible = true
},
//
resetForm() {

@ -0,0 +1,160 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="orderQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="追溯码:">
<el-input v-model="orderQuery.unionCode" placeholder="请扫描或输入追溯码"
style="width: 500px"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<!--<el-button type="primary" icon="el-icon-check" @click="confirmSelect"></el-button>-->
</el-button-group>
</div>
<el-table
:data="dataList"
style="width: 100%"
highlight-current-row="false"
v-loading="loading"
border
@current-change="handleChange"
ref="multipleTable"
>
<!--<el-table-column label width="45">-->
<!-- <template slot-scope="scope">-->
<!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="追溯码"
prop="nameCode"
width="140"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="级别"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="药品信息"
prop="packUnit"
show-overflow-tooltip
></el-table-column>
<el-table-column
width="100"
label="批次号"
prop="bzgg"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装规格"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="price"
show-overflow-tooltip
></el-table-column>
<!--<el-table-column-->
<!-- label="器械类别"-->
<!-- prop="qxlb"-->
<!-- show-overflow-tooltip-->
<!--&gt;</el-table-column>-->
<el-table-column
label="有效期至"
prop="companyName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
prop="prepnSpec"
show-overflow-tooltip
></el-table-column>
<!--<el-table-column label="操作" width="160" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="handleDetailClick(scope.row)"-->
<!-- >详情-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="handleDetailClick(scope.row)"-->
<!-- >追溯码明细-->
<!-- </el-button>-->
<!-- </template>-->
<!--</el-table-column>-->
</el-table>
<pagination
v-show="pageTotal>0"
:total="pageTotal"
:page.sync="orderQuery.page"
:limit.sync="orderQuery.limit"
/>
<!--@pagination="getList"-->
</el-card>
<!--<el-dialog-->
<!-- title="药品字典详情"-->
<!-- :visible.sync="udiRlDetailVisible"-->
<!-- width="85%"-->
<!-- :close-on-click-modal="false"-->
<!-- :close-on-press-escape="false"-->
<!-- append-to-body-->
<!-- v-if="udiRlDetailVisible"-->
<!--&gt;-->
<!-- <drugDetail :editQuery="currentRow"></drugDetail>-->
<!--</el-dialog>-->
</div>
</template>
<script>
export default {
data() {
return {
orderQuery:{
page: 1,
limit: 10,
},
pageTotal:10,
dataList:[
{
nameCode:'83569990243678280449',
cpmctymc:'1',
packUnit: '注射用A型肉毒毒素 注射剂 100U/瓶',
bzgg: '20230958-2',
prepnSpec:"兰州生物技术开发有限公司",
prepnUnit: '厦门湖里妇幼保健院',
zczbhhzbapzbh: '盒1瓶',
}
],
showSearch: true
}
},
methods:{
hideSearch() {
this.showSearch = !this.showSearch;
},
}
}
</script>
<style scoped>
</style>

@ -0,0 +1,322 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="orderQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据编号:">
<el-input v-model="orderQuery.bill_code" placeholder="单据编号"
style="width: 90%"
clearable="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型:" class="query-form-item">
<el-select v-model="orderQuery.bill_type" style="width: 90%" placeholder="选择单据" clearable>
<el-option label="所有" :value="'A'"></el-option>
<el-option label="入库" :value="'AI'"></el-option>
<el-option label="出库" :value="'AO'"></el-option>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="药品信息:">-->
<!-- <el-input v-model="orderQuery.cpmctymc" placeholder="药品信息" clearable="true"-->
<!-- style="width: 90%"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="6">
<el-form-item class="query-form-item" label="发货单位:">
<el-input v-model="orderQuery.bzgg" placeholder="发货单位" clearable="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="收货单位:">
<el-input v-model="orderQuery.ylqxzcrbarmc" placeholder="收货单位"
style="width: 90%"
clearable="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="单据时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 300px"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-check" @click="confirmSelect"></el-button>
</el-button-group>
</div>
<el-table
:data="dataList"
style="width: 100%"
highlight-current-row="false"
v-loading="loading"
border
@current-change="handleChange"
ref="multipleTable"
>
<el-table-column label width="45">
<template slot-scope="scope">
<el-radio :label="scope.row.billCode" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="订单编号"
prop="billCode"
width="140"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="单据类型"
prop="billTypeName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="药品信息"
prop="packUnit"
show-overflow-tooltip
></el-table-column>
<el-table-column
width="100"
label="批次号"
prop="bzgg"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="发货单位"
prop="fromUserName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="收货单位"
prop="toUserName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装规格"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="price"
show-overflow-tooltip
></el-table-column>
<!--<el-table-column-->
<!-- label="器械类别"-->
<!-- prop="qxlb"-->
<!-- show-overflow-tooltip-->
<!--&gt;</el-table-column>-->
<el-table-column
label="有效期至"
prop="companyName"
show-overflow-tooltip
></el-table-column>
<el-table-column
width="120"
label="最小包装数量"
prop="companyName"
show-overflow-tooltip
></el-table-column>
<el-table-column
width="120"
label="单据时间"
prop="billTime"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleDetailClick(scope.row)"
>详情
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="handleCodeDetailClick(scope.row)"
>追溯码明细
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="pageTotal>0"
:total="pageTotal"
:page.sync="orderQuery.page"
:limit.sync="orderQuery.limit"
/>
<!--@pagination="getList"-->
</el-card>
<el-dialog
title="追溯码明细"
:visible.sync="codeDetailVisible"
append-to-body width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="codeDetailVisible"
>
<retraceCodeDetailDialog>
</retraceCodeDetailDialog>
</el-dialog>
</div>
</template>
<script>
import retraceCodeDetailDialog from './retraceCodeDetailDialog'
// import { getCodeList } from '@/api/inout/order'
export default {
components: { retraceCodeDetailDialog },
data() {
return {
orderQuery: {
bill_code: '',
bill_type: 'A',
begin_date:'',
ens_date:'',
cur_page: 1,
page_size: 10
},
pageTotal: 10,
dataList: [
{
billCode: '1000110',
billTypeName: '使用出库',
packUnit: '注射用A型肉毒毒素 注射剂 100U/瓶',
bzgg: '20230958-2',
// prepnSpec:"",
fromUserName: '厦门湖里妇幼保健院'
},
{
billCode: '1000111',
billTypeName: '采购入库',
packUnit: '注射用A型肉毒毒素 注射剂 100U/瓶',
bzgg: '20230958-2',
prepnSpec: '厦门湖里妇幼保健院',
fromUserName: '国药控股福建有限公司'
}
],
pickerOptions: {
shortcuts: [
{
text: '最近一个月',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
picker.$emit('pick', [start, end])
}
},
{
text: '最近三个月',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
picker.$emit('pick', [start, end])
}
}
]
},
actDateRange: [],
showSearch: true,
codeDetailVisible: false,
radioCheck: null
}
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch
},
handleCodeDetailClick(row) {
this.codeDetailVisible = true
const parts = row.packUnit.split(' ')
let drugName = parts[0] //
let dosageForm = parts[1] //
let packUnitDetail = parts.slice(2).join(' ')
console.log('1', drugName)
console.log('2', dosageForm)
console.log('3', packUnitDetail)
},
handleChange(currentRow) {
this.radioCheck = currentRow.billCode
},
createDateTime() {
const end = new Date(); //
const start = new Date(); //
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); // 7
const formatDate = (date) => {
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
};
this.actDateRange = [formatDate(start), formatDate(end)];
},
// getList() {
// if (this.actDateRange !== null) {
// this.orderQuery.begin_date = this.actDateRange[0]
// this.orderQuery.ens_date = this.actDateRange[1]
// }
// getCodeList().then(res => {
// if (res.code == 20000) {
// this.dataList = res.data
// }
// })
// }
},
created() {
// this.getList()
this.createDateTime()
}
}
</script>
<style scoped>
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;
}
div /deep/ .el-table .success-row {
background: #ffffff;
}
</style>
Loading…
Cancel
Save