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

代码备份

Browse Source
master
anthonyywj2 3 years ago
parent 10bea3a4e2
commit fa54506818
5 changed files with 666 additions and 559 deletions
Show Stats Download Patch File Download Diff File

8
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -180,6 +180,10 @@ export default {
secCheckWebNew: null, secCheckWebNew: null,
secCheckChange: null, secCheckChange: null,
thirdAction: null, thirdAction: null,
corpType: null,
storageCode: null,
secCheckSp: null,
checkSp: null,
}, },
enableMap: { enableMap: {
true: "是", true: "是",
@ -317,6 +321,10 @@ export default {
secCheckWebNew: row.secCheckWebNew, secCheckWebNew: row.secCheckWebNew,
secCheckChange: row.secCheckChange, secCheckChange: row.secCheckChange,
thirdAction: row.thirdAction, thirdAction: row.thirdAction,
corpType: row.corpType + "",
storageCode: row.storageCode,
secCheckSp: row.secCheckSp,
checkSp: row.checkSp,
}; };
}, },

92
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -93,6 +93,44 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>往来信息类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.corpType" placeholder="往来信息">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>默认仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.storageCode" placeholder="默认仓库信息">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
@ -133,18 +171,18 @@
<el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox> <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <!-- <el-col :span="4" class="el-col">-->
<div class="text item"> <!-- <div class="text item">-->
<el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox> <!-- <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
<el-col :span="4" class="el-col"> <!-- <el-col :span="4" class="el-col">-->
<div class="text item"> <!-- <div class="text item">-->
<el-checkbox v-model="inputQuery.genUnit" <!-- <el-checkbox v-model="inputQuery.genUnit"-->
:disabled="inputQuery.mainAction == 'WareHouseIn'">允许手动输入客户信息 <!-- :disabled="inputQuery.mainAction == 'WareHouseIn'">允许手动输入客户信息-->
</el-checkbox> <!-- </el-checkbox>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
@ -164,13 +202,13 @@
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.checkPdaEd" :disabled="!inputQuery.checkEnable">手持终端未校验单据 <el-checkbox v-model="inputQuery.checkPdaUn" :disabled="!inputQuery.checkEnable">手持终端未校验单据
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.checkPdaUn" :disabled="!inputQuery.checkEnable">手持终端已校验单据 <el-checkbox v-model="inputQuery.checkPdaEd" :disabled="!inputQuery.checkEnable">手持终端已校验单据
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
@ -271,6 +309,7 @@ import {getOriginBusType} from "../../api/basic/busOriginType";
import { import {
getLocalBusType, getLocalBusType,
} from "../../api/basic/busLocalType"; } from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse";
export default { export default {
name: "inputQuery", name: "inputQuery",
@ -286,11 +325,23 @@ export default {
filterQuery: { filterQuery: {
enabled: true, enabled: true,
isBuType: true, isBuType: true,
isFilterBind: true,
}, },
thirdSys: [], thirdSys: [],
localTypes: [], localTypes: [],
originTypes: [], originTypes: [],
value: "", value: "",
options: [{
value: '0',
label: '供应商信息'
}, {
value: '1',
label: '仓库信息'
}, {
value: '2',
label: '客户信息'
}],
storageList: [],
} }
}, },
methods: { methods: {
@ -318,15 +369,20 @@ export default {
this.localTypes = []; this.localTypes = [];
}); });
}, },
getStorage() {
getLoca() { this.storageList = [];
filterAll()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
}, },
}, },
created() { created() {
this.getList(); this.getList();
this.getLoca(); this.getStorage();
}, },
}; };
</script> </script>

315
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

@ -69,8 +69,8 @@
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="corpName" <el-form-item class="query-form-item" prop="corpName"
v-if="curAction.corpType ==0 && curAction.genUnit ==false"> v-if="curAction.corpType ==0 ">
<el-select <el-select
v-model="formData.fromCorp" v-model="formData.fromCorp"
filterable filterable
@ -80,7 +80,7 @@
placeholder="请输入往来单位" placeholder="请输入往来单位"
:remote-method="findMethod" :remote-method="findMethod"
:loading="loading" :loading="loading"
@change="unitChange" @change="selectOne"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
@ -91,32 +91,9 @@
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-select-->
<!-- style="width: 100%"-->
<!-- v-model="sValue"-->
<!-- :multiple="false"-->
<!-- filterable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- placeholder="请输入供应商名称"-->
<!-- :remote-method="remoteMethod"-->
<!-- :loading="sLoading"-->
<!-- @change="selectOne">-->
<!-- <el-option-->
<!-- v-for="item in sOptions"-->
<!-- :key="idx"-->
<!-- :label="item.name"-->
<!-- :value="item">-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1 && curAction.genUnit ==false"> v-if="curAction.corpType ==1">
<el-select <el-select
v-model="formData.fromCorp" v-model="formData.fromCorp"
filterable filterable
@ -126,7 +103,7 @@
placeholder="请输入仓库信息" placeholder="请输入仓库信息"
:remote-method="findStorageMethod" :remote-method="findStorageMethod"
:loading="loading" :loading="loading"
@change="unitChange" @change="storageChange"
> >
<el-option <el-option
v-for="item in fromStorageOptions" v-for="item in fromStorageOptions"
@ -140,7 +117,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" v-if="curAction.genUnit ==true"> <el-form-item class="query-form-item" prop="fromCorp" v-if="curAction.corpType ==2">
<el-input v-model="formData.fromCorp" auto-complete="off" <el-input v-model="formData.fromCorp" auto-complete="off"
clearable clearable
placeholder="请输入病人住院号" placeholder="请输入病人住院号"
@ -157,20 +134,19 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<el-select v-model="formData.billType" placeholder="请选择业务类型" <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange">
@change="actionChange">
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.localAction"
:label="item.name" :label="item.localName"
:value="item.action"> :value="item.localAction">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.localName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -273,21 +249,21 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<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="4"> <!-- <el-col :span="4">-->
<el-form-item prop="iCount"> <!-- <el-form-item prop="iCount">-->
<!-- @keypress.enter.native="addCode()"--> <!-- &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;-->
<el-input v-model="iCount" auto-complete="off" ref="iCount" <!-- <el-input v-model="iCount" auto-complete="off" ref="iCount"-->
@keypress.enter.native="iCountEnterFunction()" <!-- @keypress.enter.native="iCountEnterFunction()"-->
@focus="getInputFocus($event)" <!-- @focus="getInputFocus($event)"-->
@input="iCountChange" <!-- @input="iCountChange"-->
oninput="value=value.replace(/[^\d]/g,'')"></el-input> <!-- oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<!-- highlight-current-row--> <!-- highlight-current-row-->
@ -301,7 +277,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="产品名称" label="产品通用名"
prop="productName" prop="productName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -318,40 +294,75 @@
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="生产日期"> <el-table-column width="180" label="生产日期">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.productDate" <!-- <el-input size="small" v-model="scope.row.productDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请输入生产日期" style="width: 80%"></el-input>-->
<el-date-picker
type="date"
size="small" v-model="scope.row.productDate"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
placeholder="请输入生产日期" style="width: 80%"></el-input> placeholder="请选择生产日期" style="width: 80%"
value-format="yyMMdd"
format="yyyy-MM-dd"
>
</el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="失效日期"> <el-table-column width="180" label="失效日期">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.expireDate" <!-- <el-input size="small" v-model="scope.row.expireDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请输入失效日期" style="width: 80%"></el-input>-->
<el-date-picker
type="date"
size="small" v-model="scope.row.expireDate"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
placeholder="请输入失效日期" style="width: 80%"></el-input> placeholder="请选择失效日期" style="width: 80%"
value-format="yyMMdd"
format="yyyy-MM-dd"
>
</el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="产品数量"> <el-table-column width="150" label="单据数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.count" <el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%" placeholder="请输入数量" style="width: 80%"
type='number'
@change="tableCountChange(scope.row)" @change="tableCountChange(scope.row)"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
oninput="value=value.replace(/[^\d]/g,'')"></el-input> oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="实际数量">
<el-table-column width="150" label="产品价格"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.reCount"
placeholder="请输入数量" style="width: 80%"
type='number'
@change="tableCountChange(scope.row)"
:disabled="scope.row.index !== selectedIndex"
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column width="150" label="价格">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.price" <el-input size="small" v-model="scope.row.price"
type='number'
:disabled="scope.row.index !== selectedIndex"
placeholder="请输入价格" style="width: 80%" placeholder="请输入价格" style="width: 80%"
oninput="value=value.replace(/[^\d]/g,'')"></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column width="150"-->
<!--label="单据数量"-->
<!--prop="count"-->
<!--show-overflow-tooltip-->
<!--&gt;</el-table-column>-->
<el-table-column width="150" <el-table-column width="150"
label="批准文号" label="注册/备案凭证号"
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -447,7 +458,7 @@ import {
uploadStockOrderDetail, uploadStockOrderDetail,
copyStockOrderDetail, copyStockOrderDetail,
stockOrderDetailQueryProduct, stockOrderDetailQueryProduct,
addStockOrderDetailFromCodeById, getStockOrderDetailInstrumentById, stockOrderDetail2 getStockOrderDetailInstrumentById, stockOrderDetail2
} from "../../api/inout/stockOrder"; } from "../../api/inout/stockOrder";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {saveAs} from "file-saver"; import {saveAs} from "file-saver";
@ -483,8 +494,6 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
}, },
fromOptions: [],
fromStorageOptions: [],
formData: {}, formData: {},
formRules: { formRules: {
corpName: [ corpName: [
@ -496,11 +505,16 @@ export default {
billType: [ billType: [
{required: true, message: "请选择业务类型", trigger: "blur"} {required: true, message: "请选择业务类型", trigger: "blur"}
], ],
type: [ locStorageCode: [
{required: true, message: "请选择采购类型", trigger: "blur"} {required: true, message: "请选择当前仓库", trigger: "blur"}
], ],
// type: [
// {required: true, message: "请选择采购类型", trigger: "blur"}
// ],
}, },
codeArray: [], codeArray: [],
fromOptions: [],
fromStorageOptions: [],
total: 0, total: 0,
loading: false, loading: false,
index: null, index: null,
@ -508,7 +522,6 @@ export default {
formVisible: false, formVisible: false,
deleteLoading: false, deleteLoading: false,
orderNo: null, orderNo: null,
statusMap: { statusMap: {
101: "未处理", 101: "未处理",
102: "已处理", 102: "已处理",
@ -523,6 +536,10 @@ export default {
1: "预入库", 1: "预入库",
2: "普通采购", 2: "普通采购",
}, },
curAction: {
corpType: 0,
genUnit: false,
},
orderEditor: true, orderEditor: true,
iCount: 0, iCount: 0,
sOptions: [], sOptions: [],
@ -534,10 +551,7 @@ export default {
selectedIndex: "", selectedIndex: "",
selectProductVisible: false, selectProductVisible: false,
thisData: {}, thisData: {},
curAction: { storageList: [],
corpType: 0,
genUnit: false,
},
}; };
}, },
components: { components: {
@ -559,6 +573,8 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
if (status === '3') {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].batchNo)) { if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空'); return this.$message.error('批次号不能为空');
@ -570,6 +586,9 @@ export default {
return this.$message.error('失效日期不能为空'); return this.$message.error('失效日期不能为空');
} }
} }
}
if (status === '501') { if (status === '501') {
this.submitFunction(status); this.submitFunction(status);
} else { } else {
@ -577,7 +596,13 @@ export default {
if (status == "1") { if (status == "1") {
this.submitFunction(status); this.submitFunction(status);
} else { } else {
this.$confirm("是否提交订单?", "提示", { let tip = "是否确定提交订单?";
if (status == "2") {
tip = "是否确定提交单据为未配货？";
} else if (status == "3") {
tip = "是否确定提交单据为已配货？";
}
this.$confirm(tip, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -593,6 +618,45 @@ export default {
} }
}); });
}, },
storageChange(row) {
console.log(row);
this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name;
},
getStorage(event) {
// let query = {
// advanceType: this.getActionName(event),
// };
this.storageList = [];
filterAll()
.then((response) => {
this.storageList = response.data || [];
// this.formData.locStorageCode = this.storageList[0];
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].advanceType;
}
}
},
findStorageMethod(query) {
console.log(query);
this.fromStorageOptions = [];
let cQuery = {
key: query,
};
filterAll(cQuery)
.then((response) => {
this.fromStorageOptions = response.data || [];
})
.catch(() => {
});
},
submitFunction(status) { submitFunction(status) {
let tMessage = status === '501' ? '保存' : '提交'; let tMessage = status === '501' ? '保存' : '提交';
this.loading = true; this.loading = true;
@ -668,6 +732,7 @@ export default {
if (this.orderEditor) { if (this.orderEditor) {
this.thisData.orderId = this.formData.id this.thisData.orderId = this.formData.id
} }
this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true; this.selectProductVisible = true;
return; return;
} }
@ -747,6 +812,7 @@ export default {
if (this.orderEditor) { if (this.orderEditor) {
this.thisData.orderId = this.formData.id this.thisData.orderId = this.formData.id
} }
this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true; this.selectProductVisible = true;
} }
} else { } else {
@ -762,24 +828,34 @@ export default {
}, },
closeDialogC2(rData) {//012693548470801311200226172302271020022632100025 closeDialogC2(rData) {
this.selectProductVisible = false; this.selectProductVisible = false;
this.thisData = {}; this.thisData = {};
if (this.$isNotBlank(rData)) { if (this.$isNotBlank(rData)) {
console.log(rData) console.log(rData)
// for (let i = 0; i < this.codeArray.length; i++) {
// let obj = this.codeArray[i];
// if (obj.batchNo == rData[0].batchNo) {
// obj.count = parseInt(obj.count) + parseInt(this.iCount);
// return;
// }
// }
this.codeArray = [];
rData.forEach((obj, index) => { rData.forEach((obj, index) => {
if (this.codeArray.length === 0) { // this.codeArray.push(obj);
this.codeArray.push(obj);
} else {
this.codeArray.unshift(obj); this.codeArray.unshift(obj);
} // if (this.codeArray.length === 0) {
// this.codeArray.push(obj);
// } else {
// this.codeArray.unshift(obj);
// }
}); });
console.log(this.codeArray);
this.$refs.multipleTable.setCurrentRow(this.codeArray[0]); this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
this.currentRow = this.codeArray[0]; this.currentRow = this.codeArray[0];
this.selectedIndex = 0; this.selectedIndex = 0;
this.focusNext('iCount'); this.focusNext('iCount');
this.closeConfirmFunction(true); this.closeConfirmFunction(true);
} }
// if (this.orderEditor) { // if (this.orderEditor) {
@ -859,43 +935,6 @@ export default {
focusNextToTable(nextRef) { focusNextToTable(nextRef) {
this.$refs[nextRef][0].focus() this.$refs[nextRef][0].focus()
}, },
remoteMethod(query) {
if (query !== '') {
this.sLoading = true;
let tQuery = {
key: query,
page: 1,
limit: 20,
};
getBasicUnitMaintains2(tQuery)
.then((response) => {
console.log(response)
this.sLoading = false;
this.sOptions = response.data.list;
})
.catch(() => {
this.sLoading = false;
this.sOptions = [];
});
} else {
this.sOptions = [];
}
},
findMethod(query) {
console.log(query);
this.fromOptions = [];
let cQuery = {
key: query,
};
getBasicUnitMaintains(cQuery)
.then((response) => {
this.loading = false;
this.fromOptions = response.data.page.list || [];
})
.catch(() => {
this.loading = false;
});
},
// 刷新表单 // 刷新表单
resetForm() { resetForm() {
if (this.$refs["dataForm"]) { if (this.$refs["dataForm"]) {
@ -906,11 +945,6 @@ export default {
this.getList(); this.getList();
} }
}, },
unitChange(row) {
console.log(row);
this.formData.corpId = row.erpId;
this.formData.corpName = row.name;
},
addCode() { addCode() {
this.code = this.code.trim(); this.code = this.code.trim();
if (this.$isBlank(this.code)) { if (this.$isBlank(this.code)) {
@ -1148,45 +1182,46 @@ export default {
getLocalJoinBusType(query) getLocalJoinBusType(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
// this.getStorage(this.formData.billType);
}) })
.catch(() => { .catch(() => {
}); });
}, },
findStorageMethod(query) { selectOne(event) {
this.formData.corpName = event.name;
this.formData.corpId = event.erpId;
this.formData.unitIdFk = event.erpId;
// console.log("this.inputQuery.companyId" + item);
console.log("this.inputQuery.companyId" + event.erpId);
},
findMethod(query) {
console.log(query); console.log(query);
this.fromStorageOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
filterAll(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => {
this.fromStorageOptions = response.data || [];
})
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterAll()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.loading = false;
this.fromStorageOptions = response.data || []; this.fromOptions = response.data.page.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false;
}); });
}, },
getActionItem(action) { getActionItem(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) { if (this.busTypes[i].localAction === action) {
return this.busTypes[i]; return this.busTypes[i];
} }
} }
}, },
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.formData.locStorageCode = this.curAction.storageCode;
console.log(this.curAction.corpType + "---" + this.curAction.genUnit + "-----" + this.curAction.action) console.log(this.curAction.corpType + "---" + this.curAction.genUnit + "-----" + this.curAction.action)
}, },
}, },
filters: {}, filters: {},
mounted() { mounted() {
@ -1197,7 +1232,7 @@ export default {
}, },
created() { created() {
this.getBusType(); this.getBusType();
this.getStorage(this.formData.billType); this.getStorage();
this.formData = {}; this.formData = {};
this.codeArray = []; this.codeArray = [];
this.closeConfirmFunction(false); this.closeConfirmFunction(false);
@ -1211,7 +1246,7 @@ export default {
} else { } else {
this.formData = { this.formData = {
billdate: "", billdate: "",
corpName: store.getters.companyName, // corpName: store.getters.companyName,
customerId: store.getters.customerId, customerId: store.getters.customerId,
// billType: "deliveryNote", // billType: "deliveryNote",
billType: "", billType: "",

5
src/views/business/stockOrderNewSelectProduct.vue
Unescape Escape View File

@ -269,7 +269,8 @@
this.loading = true; this.loading = true;
let tQuery = { let tQuery = {
ids: ids ids: ids,
stockOrderLists: this.data.stockOrderLists,
}; };
getStockOrderDetailInstrumentById(tQuery).then((response) => { getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false; this.loading = false;
@ -317,7 +318,9 @@
}, },
}, },
created() { created() {
if (this.$isNotBlank(this.data)) { if (this.$isNotBlank(this.data)) {
console.log(this.data.stockOrderLists);
this.listQuery.nameCode = this.data.udi; this.listQuery.nameCode = this.data.udi;
this.orderEditor = this.data.orderEditor; this.orderEditor = this.data.orderEditor;
this.orderId = this.data.orderId; this.orderId = this.data.orderId;

15
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -58,7 +58,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==0 && curAction.genUnit ==false"> v-if="curAction.corpType ==0">
<el-select <el-select
v-model="formData.fromCorp" v-model="formData.fromCorp"
filterable filterable
@ -81,7 +81,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1 && curAction.genUnit ==false"> v-if="curAction.corpType ==1">
<el-select <el-select
v-model="formData.fromCorp" v-model="formData.fromCorp"
filterable filterable
@ -91,19 +91,19 @@
placeholder="请输入仓库信息" placeholder="请输入仓库信息"
:remote-method="findStorageMethod" :remote-method="findStorageMethod"
:loading="loading" :loading="loading"
@change="unitChange" @change="storageChange"
> >
<el-option <el-option
v-for="item in fromStorageOptions" v-for="item in fromStorageOptions"
:key="item.value" :key="item.value"
:label="item.code" :label="item.code"
:value="item.name"> :value="item">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" v-if="curAction.genUnit ==true"> <el-form-item class="query-form-item" prop="fromCorp" v-if="curAction.corpType ==2">
<el-input v-model="formData.fromCorp" auto-complete="off" <el-input v-model="formData.fromCorp" auto-complete="off"
clearable clearable
placeholder="请输入病人住院号" placeholder="请输入病人住院号"
@ -386,6 +386,11 @@ export default {
this.formData.fromCorpId = row.erpId; this.formData.fromCorpId = row.erpId;
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
}, },
storageChange(row) {
console.log(row);
this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name;
},
deleteCode(index, row) { deleteCode(index, row) {
console.log(row.id) console.log(row.id)
this.$confirm("是否删除?", "提示", { this.$confirm("是否删除?", "提示", {

Write Preview
Loading…
Cancel
Save