切换分支代码备份

feature-order-fix
anthonyywj2 3 years ago
parent 176cbd88e9
commit 4b16e6ffca

@ -159,13 +159,10 @@
<!-- >-->
<!-- </div>-->
<el-table border style="margin-bottom: 20px;margin-top: 10px" :data="changeList">
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="补单说明" prop="intro"></el-table-column>
<!-- <el-table-column label="补单单据类型代码" prop="action"></el-table-column>-->
<el-table-column label="补单扫码单据类型" prop="name"></el-table-column>
<el-table-column label="推前时长(小时)" prop="beforeTime"></el-table-column>
<el-table-column label="补单默认仓库" prop="defautInvName"></el-table-column>
<el-table-column label="补单默认分库" prop="defautSubInvName"></el-table-column>
<el-table-column label="推前时长(小时)" prop="beforeTime"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
@ -474,8 +471,12 @@ export default {
} else {
updateChangeBusType(this.editQuery)
.then((response) => {
this.editChangeTypeVisible = false;
this.getList();
if (response.code == 999) {
this.$message.error(response.message);
} else {
this.editChangeTypeVisible = false;
this.getList();
}
})
.catch(() => {
});

@ -226,7 +226,7 @@
<el-checkbox v-model="inputQuery.enable" :disabled="inputQuery.localAction==null"></el-checkbox>
<el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">
</el-checkbox>
<el-checkbox v-model="inputQuery.useDyCount" :disabled="true">使
<el-checkbox v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType !=2">使
</el-checkbox>
<el-checkbox v-model="inputQuery.outTospms">
</el-checkbox>
@ -579,7 +579,7 @@ export default {
,
//
getOrderType() {
this.orderTypeList = [];
let query = {
mainAction: this.inputQuery.mainAction,

@ -510,7 +510,7 @@
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
>以使用单元数量入库
>启用使用单元
</el-checkbox>
</el-form-item>
</el-col>

@ -488,10 +488,6 @@
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" class=""
:disabled="!isUseDyCheck"
>以使用单元数量入库
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" class=""
@change="diableChange"
>是否禁用
@ -512,6 +508,23 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-bottom: 18px">
<el-checkbox v-model="checked" class=""
:disabled="!isUseDyCheck || editQuery.useMuti==true "
@change="useDyCheckChange"
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.useMuti" class=""
:disabled="checked"
@change="useMutiChange"
>允许科室多次使用出库
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-collapse v-model="activeNames">
@ -538,7 +551,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>最小包装单元内包含使用单元数量:&nbsp;</span>
<span>最小包装内包含使用单元数量:&nbsp;</span>
</div>
<el-input
style="width: 65%"
@ -585,6 +598,25 @@
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>最小包装可使用次数:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
:disabled="useNumEnable"
type="number"
v-model="editQuery.useNum"
></el-input>
</div>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="2">
@ -1071,7 +1103,8 @@ export default {
selectLocalVisible: false, //UDI
isUseDyCheck: false,
lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
activeNames: ['1']
activeNames: ['1'],
useNumEnable: true,
};
},
@ -1131,6 +1164,28 @@ export default {
this.detailList = [];
});
},
useDyCheckChange(val) {
this.editQuery.useNum = 0;
},
useDyCountChange(val) {
if (val) {
this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
} else {
this.editQuery.useNum = 0;
}
},
useMutiChange(val) {
if (val) {
this.useNumEnable = false;
this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
} else {
this.useNumEnable = true;
this.editQuery.useNum = 0;
}
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();
@ -1569,7 +1624,7 @@ export default {
float: left;
text-align: left;
margin-top: 10px;
width: 25%;
width: 35%;
}
.text {

@ -683,7 +683,7 @@
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" disabled
>是否禁用

@ -360,7 +360,7 @@
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
</el-form-item>
</el-col>

@ -1,512 +0,0 @@
<template>
<div>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
<!-- <el-button-->
<!-- type="primary"-->
<!-- @click.native="submit('1')"-->
<!-- style="margin: -50px 0 10px auto; height: 35px"-->
<!-- >保存订单-->
<!-- </el-button-->
<!-- >-->
<el-button
type="primary"
@click.native="closeDialog()"
>草稿保存
</el-button
>
<el-button
type="primary"
@click.native="submit('0')"
>提交订单
</el-button
>
</el-button-group>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>入库单号</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="corpOrderId">
<el-input v-model="formData.corpOrderId" auto-complete="off"
:disabled="corpOrderIdDisabled"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>日期</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="actDate">
<el-date-picker
v-model="formData.actDate"
type="datetime"
placeholder="日期"
:disabled="true"
style="width: 100%; "
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>往来单位</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="fromCorp">
<el-input v-model="formData.fromCorp" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>单据类型</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item">
<el-select v-model="formData.billType" placeholder="请选择业务类型">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>条码</span>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="code">
<el-input
@keyup.enter.native="addCode($event)"
v-model="formData.code"
ref='inputRef'
@focus="getInputFocus($event)"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-col>
<div class="text item" style="margin-left: 30px"> 已扫码条码{{ total }}
</div>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
ref="multipleTable">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="序号" type="index" width="100"></el-table-column>
<el-table-column
label="条码"
prop="code"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="200"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteCode(scope.$index, scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@current-change="handleCurrentChange"
layout="prev, pager, next"
:page-size="query.limit"
:total="total"
:current-page="query.page"
>
</el-pagination>
</div>
</el-form>
</div>
</template>
<script>
import {
orderGetUdi, orderList, codeList, orderListError,
mergeOrder, postOrdersWeb, errorCodeList, addOrderWeb, deleteCodesTempById, submitOrderWeb
} from "../../api/inout/order";
import draggable from "vuedraggable";
import {saveAs} from "file-saver";
import {getBussinessType} from "../../api/basic/bussinessType";
import {parseTime} from "../../filtres/index";
import store from "../../store";
const formJson = {
corpOrderId: "",
code: "",
actor: "",
fromCorpId: "",
fromCorp: "医院",
fromType: "网页端",
actDate: new Date(),
billType: null,
};
export default {
name: "idQuery",
props: {
closeDialog: {
type: Function,
required: true,
},
idQuery: {
type: Object,
required: true,
},
},
data() {
return {
codeQuery: {
code: "",
},
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 10,
},
actionMap: {
1: "ProduceWareHouseIn",
2: "PurchaseWareHouseIn",
3: "ReturnWareHouseIn",
4: "AllocateWareHouseIn",
5: "SalesWareHouseOut",
6: "ReturnWareHouseOut",
7: "AllocateWareHouseOut",
8: "DestoryWareHouseOut",
9: "DirectAllocateWareHouseOut",
10: "ReworkWareHouseOut",
11: "CheckWareHouseOut",
12: "CodeReplace",
13: "CodeDestory",
14: "StockCheck",
15: "deliveryNote",
},
mainActionMap: {
1: "WareHouseIn",
2: "WareHouseIn",
3: "WareHouseIn",
4: "WareHouseIn",
5: "WareHouseOut",
6: "WareHouseOut",
7: "WareHouseOut",
8: "WareHouseOut",
9: "WareHouseOut",
10: "WareHouseOut",
11: "WareHouseOut",
12: "none",
13: "none",
14: "none",
15: "none",
},
formData: formJson,
formRules: {
temp: [
{required: true, message: "请输入条码", trigger: "blur"}
],
},
corpOrderIdDisabled: false,
codeArray: [],
total: 0,
loading: false,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
busTypes: [],
};
},
components: {
draggable,
},
methods: {
submit(formName) {
if (this.total < 1) {
this.$message.error('未添加条码');
return;
}
let tQuery = {
orderId: this.idQuery.id
}
submitOrderWeb(tQuery)
.then((response) => {
console.log(response)
if (response.code === 20000) {
this.$message.success("提交成功");
this.closeDialog();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
// if (this.$refs.multipleTable.selection.length < 1) {
// this.$message.error('');
// return;
// }
// this.formData.corpOrderId = this.formData.corpOrderId.trim();
// if (this.formData.corpOrderId === null || this.formData.corpOrderId === '') {
// let date = new Date();
// this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
// }
// for (let i = 0; i < this.codeArray.length; i++) {
// this.codeArray[i].corpOrderId = this.formData.corpOrderId;
// }
// let postOrder = {
// billType: this.formData.billType,
// codes: this.$refs.multipleTable.selection
// }
// let postOrderList = [];
// postOrderList.push(postOrder);
// let tQuery = {
// postOrders: postOrderList,
// submitType: formName,
// oldOrderId: this.idQuery.id !== null && this.idQuery.id !== '' ? this.idQuery.id : '',
// }
// let message = formName === '0' ? "" : "";
// this.$confirm("" + message + "?", "", {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }).then(() => {
// postOrdersWeb(tQuery).then((response) => {
// if (response.code === 20000) {
// this.$message.success(message + "")
// this.closeDialog();
// } else {
// this.$message.error(response.message);
// }
// });
// }).catch(() => {
// });
},
//
resetForm() {
if (this.$refs["dataForm"]) {
//
this.$refs["dataForm"].clearValidate();
//
this.$refs["dataForm"].resetFields();
this.getList();
}
},
addCode(event) {
if (event == null) {
this.$refs.inputRef.focus();
} else event.target.select();
this.formData.corpOrderId = this.formData.corpOrderId.trim();
if (this.$isBlank(this.formData.corpOrderId)) {
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
}
this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return;
this.loading = true;
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
tQuery.orderId = this.idQuery.id;
tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
tQuery.mainAction = this.mainActionMap[tQuery.billType];
tQuery.action = this.actionMap[tQuery.billType];
addOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.idQuery.id = response.data;
this.corpOrderIdDisabled = true;
this.getCodeList();
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: action => {
this.$refs.inputRef.focus();
}
});
// this.$message.error(response.message);
}
this.loading = false;
});
},
deleteCode(index, row) {
console.log(row.id)
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
let tQuery = {
id: row.id
}
deleteCodesTempById(tQuery)
.then((response) => {
if (response.code === 20000) {
this.getCodeList();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
}).catch(() => {
});
},
getInputFocus(event) {
event.currentTarget.select();
},
tableSelection() {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleAllSelection();
},
handleSizeChange(val) {
this.query.limit = val;
this.getCodeList();
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
},
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType;
}
this.tableSelection();
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.billType = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
intentBack() {
this.$router.go(-1);
},
},
filters: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '' : store.getters.companyName;
this.formData.customerId = store.getters.customerId;
this.getBusType();
if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate);
this.formData.corpOrderId = this.idQuery.corpOrderId;
this.corpOrderIdDisabled = true;
this.getCodeList();
} else {
this.corpOrderIdDisabled = false;
if (JSON.stringify(this.$route.query) === '{}') {
// this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
} else {
//
let query = this.$route.query;
this.orderNo = query.id;
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
//
// this.getCodeList();
}
}
},
};
</script>
<style>
.messageIndex {
z-index: 9999 !important;
}
.ao-text {
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
}
</style>

@ -365,8 +365,6 @@ import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";

@ -477,15 +477,12 @@ import {
uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText
} from "../../api/inout/stockOrder";
import {BASE_URL} from "../../config/app";
import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport";
import selectThrOrder from "./selectThrOrderDialog";
import selectReceiveOrderDialog from "../inout/selectReceiveOrderDialog";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";

@ -163,13 +163,13 @@
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope" v-if="!haveDistributionVisible">
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="handleDetailForm(scope.$index, scope.row)"-->
<!-- >编辑-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="handleDetailForm(scope.$index, scope.row)"-->
<!-- >编辑-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
size="small"
@ -503,8 +503,6 @@ import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport";
import selectThrOrder from "./selectThrOrderDialog";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";

@ -345,8 +345,6 @@ import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";

@ -454,7 +454,7 @@
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" disabled
>是否禁用

@ -103,7 +103,7 @@
</el-table-column>
<el-table-column label="当前分库" prop="subInvName" width="120">
</el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
</el-table-column>
@ -341,7 +341,7 @@ export default {
add: "新增",
edit: "编辑",
},
enableDept:false,
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",

@ -86,7 +86,7 @@
<el-col :span="3">
<div class="ao-text">
<span>是否以使用单元数量入库</span>
<span>是否以使用单元数量入库</span>
</div>
</el-col>
<el-col :span="7">

@ -458,7 +458,7 @@
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
>以使用单元数量入库
>启用使用单元
</el-checkbox>
</el-form-item>
</el-col>

Loading…
Cancel
Save