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

bug修复

Browse Source
master
anthonywj 3 years ago
parent 301a4a7dd5
commit 6cd9dda6b2
12 changed files with 1000 additions and 777 deletions
Show Stats Download Patch File Download Diff File

11
src/api/basic/busLocalType.js
Unescape Escape View File

@ -16,6 +16,17 @@ export function getLocalJoinBusType(query) {
}); });
} }
export function getLocalJoinNoUse(query) {
return axios({
url: "/udiwms/localBusType/filterUnUse",
method: "get",
params: query
});
}
export function filterByBus(query) { export function filterByBus(query) {
return axios({ return axios({
url: "/udiwms/localBusType/filterByBus", url: "/udiwms/localBusType/filterByBus",

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

@ -70,10 +70,10 @@
<el-select v-model="inputQuery.localAction" placeholder="请选择" clearable> <el-select v-model="inputQuery.localAction" placeholder="请选择" clearable>
<el-option <el-option
v-for="item in localTypes" v-for="item in localTypes"
:key="item.action" :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>
</div> </div>
@ -161,7 +161,7 @@
<div class="text item" style="margin-top: 6px"> <div class="text item" style="margin-top: 6px">
<el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox> <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
<!-- <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>--> <!-- <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>-->
<!-- <el-checkbox v-model="inputQuery.genUnit">允许手动输入信息</el-checkbox>--> <!-- <el-checkbox v-model="inputQuery.genUnit">允许手动输入信息</el-checkbox>-->
</div> </div>
@ -306,7 +306,7 @@ import {
} from "../../api/basic/basicThirdSys"; } from "../../api/basic/basicThirdSys";
import { import {
getLocalBusType, getLocalBusType, getLocalJoinNoUse
} from "../../api/basic/busLocalType"; } from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll} from "@/api/basic/invWarehouse";
import {getJoinBussinessType} from "../../api/basic/bussinessType"; import {getJoinBussinessType} from "../../api/basic/bussinessType";
@ -356,7 +356,10 @@ export default {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
}); });
getLocalBusType(this.filterQuery) let query = {
curAction: this.inputQuery.localAction,
};
getLocalJoinNoUse(query)
.then((response) => { .then((response) => {
this.localTypes = response.data.list || []; this.localTypes = response.data.list || [];
}) })
@ -379,7 +382,7 @@ export default {
if (!type) { if (!type) {
this.twoCheck = true; this.twoCheck = true;
this.inputQuery.secCheckEnable = false; this.inputQuery.secCheckEnable = false;
}else } else
this.twoCheck = false; this.twoCheck = false;
}, },
//获取单据类型 //获取单据类型
@ -387,7 +390,7 @@ export default {
this.orderTypeList = []; this.orderTypeList = [];
let query = { let query = {
mainAction: this.inputQuery.mainAction, mainAction: this.inputQuery.mainAction,
curAction:this.inputQuery.supplementOrderType, curAction: this.inputQuery.supplementOrderType,
}; };
getCandidateBussinessType(query).then((response) => { getCandidateBussinessType(query).then((response) => {
this.orderTypeList = response.data || []; this.orderTypeList = response.data || [];

4
src/views/basic/CorpImport.vue
Unescape Escape View File

@ -29,8 +29,8 @@
> >
<el-button size="mini" type="primary">导入往来单位信息</el-button> <el-button size="mini" type="primary">导入往来单位信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl">模板下载 <!-- <el-button type="primary" icon="search" @click="jumpDl">模板下载-->
</el-button> <!-- </el-button>-->
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>

4
src/views/basic/UdiInfoImport.vue
Unescape Escape View File

@ -30,8 +30,8 @@
> >
<el-button size="mini" type="primary">导入器械信息</el-button> <el-button size="mini" type="primary">导入器械信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl">模板下载 <!-- <el-button type="primary" icon="search" @click="jumpDl">模板下载-->
</el-button> <!-- </el-button>-->
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>

142
src/views/basic/basicCompanyProducts.vue
Unescape Escape View File

@ -157,14 +157,20 @@
<!--</el-button>--> <!--</el-button>-->
<!--:disabled="scope.row.tyshxydm == null"--> <!--:disabled="scope.row.tyshxydm == null"-->
<el-button <el-button
v-if="isSpCombine" v-if="scope.row.lockStatus!=3"
type="text" type="text"
size="small" size="small"
:disabled="scope.row.lockStatus===3" :disabled="scope.row.lockStatus===3"
@click.native.stop="handleModifyClick(scope.row)" @click.native.stop="handleModifyClick(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button
v-if=" scope.row.lockStatus==3"
type="text"
size="small"
@click.native.stop="handleDetailClick(scope.row)"
>详情
</el-button>
<el-button <el-button
v-if="isSpCombine" v-if="isSpCombine"
type="text" type="text"
@ -174,13 +180,6 @@
>提交审核 >提交审核
</el-button> </el-button>
<el-button
v-if="!isSpCombine"
type="text"
size="small"
@click.native.stop="handleDetailClick(scope.row)"
>详情
</el-button>
<el-button type="text" size="small" <el-button type="text" size="small"
@click.native.stop="deleteCompanyProductRelevance(scope.row)" @click.native.stop="deleteCompanyProductRelevance(scope.row)"
@ -649,7 +648,6 @@
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="产品信息详情" title="产品信息详情"
:visible.sync="detailDialogVisible" :visible.sync="detailDialogVisible"
@ -660,6 +658,99 @@
> >
<el-card>
<el-table :data="sysList" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="系统名称"
prop="sysName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品编码"
prop="thirdId"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品名称"
prop="thirdName"
show-overflow-tooltip
></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="addSelectErp(scope.row)"
disabled
>关联
</el-button
>
<el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
disabled
>解绑
</el-button>
<!-- :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''"-->
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<div style=" float: left;
text-align: left;
font-weight: bold;
margin-bottom: 8px"
>
<span>产品标识:</span>
</div>
<div style=" float: right;
text-align: right;
margin-bottom: 8px;"
>
<el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
style="text-align:right" disabled
>解绑DI器械信息
</el-button
>
</div>
<el-table
v-loading="loading"
:data="detailList"
style="width: 100%; margin-top: 20px"
border
@current-change="handleDetail"
>
<el-table-column
label="产品标识"
prop="nameCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装级别"
prop="packLevel"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装层级"
prop="bzcj"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-card>
<el-form <el-form
:model="editQuery" :model="editQuery"
:rules="rules" :rules="rules"
@ -708,7 +799,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.ggxh" v-model="editQuery.ggxh"
@ -723,7 +814,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.qxlb" v-model="editQuery.qxlb"
@ -739,7 +830,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.cplb" v-model="editQuery.cplb"
@ -753,7 +844,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.flbm" v-model="editQuery.flbm"
@ -770,7 +861,7 @@
<span>商品条码:&nbsp;</span> <span>商品条码:&nbsp;</span>
</div> </div>
<el-input <el-input
style="width: 65%" :disabled="true" style="width: 65%"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.sptm" v-model="editQuery.sptm"
@ -784,7 +875,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
size="small" :disabled="true" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.ybbm" v-model="editQuery.ybbm"
></el-input> ></el-input>
@ -800,7 +891,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="ylqxzcrbarmc" splaceholder="ylqxzcrbarmc"
v-model="editQuery.ylqxzcrbarmc" v-model="editQuery.ylqxzcrbarmc"
@ -814,7 +905,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.ylqxzcrbarywmc" v-model="editQuery.ylqxzcrbarywmc"
@ -832,7 +923,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.tyshxydm" v-model="editQuery.tyshxydm"
@ -846,7 +937,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="true" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.zczbhhzbapzbh" v-model="editQuery.zczbhhzbapzbh"
@ -960,7 +1051,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="!checked" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.zxxsbzbhsydysl" v-model="editQuery.zxxsbzbhsydysl"
@ -974,7 +1065,7 @@
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
:disabled="!checked" :disabled="false"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
@ -1011,7 +1102,6 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="关联选入器械信息" title="关联选入器械信息"
:visible.sync="selectUdiDialogVisible" :visible.sync="selectUdiDialogVisible"
@ -1056,7 +1146,6 @@
@closeUdi="closeUdi" @closeUdi="closeUdi"
></selectLocalUdi> ></selectLocalUdi>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选入产品信息" title="选入产品信息"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
@ -1070,7 +1159,6 @@
:uuid="uuid" :uuid="uuid"
></selectProduct> ></selectProduct>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@ -1128,7 +1216,7 @@ export default {
thirdId: "", thirdId: "",
isDisable: null, isDisable: null,
isUseDy: false, isUseDy: false,
isAdavence:null, isAdavence: null,
}, },
productType: null, productType: null,
defaultSys: null, defaultSys: null,
@ -1489,7 +1577,7 @@ export default {
// thirdId: row.thirdId, // thirdId: row.thirdId,
isUseDy: row.isUseDy, isUseDy: row.isUseDy,
isDisable: row.isDisable, isDisable: row.isDisable,
isAdavence:row.isAdavence, isAdavence: row.isAdavence,
}; };
this.checked = row.isUseDy == 1; this.checked = row.isUseDy == 1;

6
src/views/thrsys/ThrCorpsImport.vue
Unescape Escape View File

@ -44,9 +44,9 @@
> >
<el-button size="mini" type="primary">导入往来单位</el-button> <el-button size="mini" type="primary">导入往来单位</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载 <!-- v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadCorps" <el-button type="primary" icon="search" @click="downloadCorps"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载往来单位 下载往来单位

6
src/views/thrsys/ThrOrderImport.vue
Unescape Escape View File

@ -44,9 +44,9 @@
> >
<el-button size="mini" type="primary">导入业务单据</el-button> <el-button size="mini" type="primary">导入业务单据</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
>模板下载 <!-- >模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadOrderss" <el-button type="primary" icon="search" @click="downloadOrderss"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载业务单据 下载业务单据

6
src/views/thrsys/ThrProductsImport.vue
Unescape Escape View File

@ -43,9 +43,9 @@
> >
<el-button size="mini" type="primary">导入产品信息</el-button> <el-button size="mini" type="primary">导入产品信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
>模板下载 <!-- >模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadProducts" <el-button type="primary" icon="search" @click="downloadProducts"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载产品信息 下载产品信息

28
src/views/warehouse/stockOrder.vue
Unescape Escape View File

@ -10,7 +10,33 @@
> >
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<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>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>

1469
src/views/warehouse/stockOrderDelSearch.vue
View File

File diff suppressed because it is too large Load Diff

25
src/views/warehouse/stockOrderEditDistribution.vue
Unescape Escape View File

@ -306,11 +306,21 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" <!-- <el-table-column width="150"-->
label="单据数量" <!-- label="单据数量"-->
prop="count" <!-- prop="count"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column width="150" label="单据数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
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" <el-table-column width="150"
label="注册/备案凭证号" label="注册/备案凭证号"
@ -528,7 +538,7 @@ export default {
currentRow: {}, currentRow: {},
selectedIndex: "", selectedIndex: "",
selectProductVisible: false, selectProductVisible: false,
selectInvProductVisible:false, selectInvProductVisible: false,
thisData: {}, thisData: {},
storageList: [], storageList: [],
}; };
@ -776,7 +786,8 @@ export default {
this.thisData = {}; this.thisData = {};
if (this.$isNotBlank(rData)) { if (this.$isNotBlank(rData)) {
console.log(rData) console.log(rData);
this.codeArray = [];
rData.forEach((obj, index) => { rData.forEach((obj, index) => {
if (this.codeArray.length === 0) { if (this.codeArray.length === 0) {
this.codeArray.push(obj); this.codeArray.push(obj);

55
src/views/warehouse/stockOrderSearch.vue
Unescape Escape View File

@ -21,6 +21,58 @@
<!-- <el-option label="已校验" value="4"></el-option>--> <!-- <el-option label="已校验" value="4"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<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>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<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>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker <el-date-picker
@ -337,6 +389,9 @@ export default {
data() { data() {
return { return {
query: { query: {
billType:null,
corpName:null,
locStorageCode:null,
startTime: "", startTime: "",
endTime: "", endTime: "",
billNo: "", billNo: "",

Write Preview
Loading…
Cancel
Save