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

Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

Browse Source 
# Conflicts:
#	src/views/collect/DealOrder.vue
20240912_adapter_z
yewj 8 months ago
parent 21b01ae12c 1ab7a15fd1
commit 6a7607c794
7 changed files with 110 additions and 95 deletions
Show Stats Download Patch File Download Diff File

34
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -711,23 +711,23 @@
<span class="sptext">是否必须维护资质材料</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">是否拆零</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">是否拆零</span>
</el-col>
</el-row>
<!--<el-divider></el-divider>-->
<!--<el-row>-->
<!-- <el-col span="5">-->
<!-- <span class="sptext">是否拆零</span>-->
<!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="5">-->
<!-- <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>-->
<!-- <el-option label="是" :value="true"></el-option>-->
<!-- <el-option label="否" :value="false"></el-option>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="13">-->
<!-- <span class="sptext">是否拆零</span>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-divider></el-divider>
<el-row>
<el-col span="5">

12
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -89,6 +89,15 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="单据流通方式:" prop="orderCirType" class="query-form-item">
<el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-option label="配送流通" :value="1"></el-option>
<el-option label="出库使用" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
@ -227,6 +236,9 @@ export default {
warnType: [
{ required: true, message: '请选择异常方式提醒', trigger: 'blur' }
],
orderCirType: [
{ required: true, message: '请选择单据流通方式', trigger: 'blur' }
],
corpType: [
// { required: true, message: '请选择往来单位类型', trigger: 'blur' }
],

19
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -254,10 +254,10 @@
highlight-current-row
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="业务类型编码 " prop="documentTypeCode"></el-table-column>
<el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>
<el-table-column label="业务名称 " prop="busName"></el-table-column>
<el-table-column label="仓库名称 " prop="invName"></el-table-column>
<el-table-column label="是否配套系统" prop="isMatching">
<el-table-column label="是否配套系统" prop="isMatching" width="100">
<template slot-scope="scope">
<span>{{ isMatchings[scope.row.isMatching] }}</span>
</template>
@ -272,17 +272,22 @@
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<el-table-column label="异常方式提醒" prop="warnType">
<el-table-column label="单据流通方式 " prop="orderCirType" width="100">
<template slot-scope="scope">
<span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
</template>
</el-table-column>
<el-table-column label="异常方式提醒" prop="warnType" width="100">
<template slot-scope="scope">
<span>{{ warnTypeMap[scope.row.warnType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位类型" prop="corpType">
<el-table-column label="往来单位类型" prop="corpType" width="100">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来类型标题" prop="unitTittle"></el-table-column>
<el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>
<el-table-column label="操作" fixed="right" width="120">
<template slot-scope="scope">
<el-button
@ -770,6 +775,10 @@ export default {
2: '自动不添加',
3: '根据提醒决定'
},
orderCirTypes: {
1: '配送流通',
2: '出库使用',
},
workplaceStatusMap: {
0: '暂停',
1: '启用'

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

@ -25,12 +25,12 @@
</el-row>
<!-- <el-alert-->
<!-- style="margin-top: 15px"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!--</el-alert>-->
<!-- <el-alert-->
<!-- style="margin-top: 15px"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!--</el-alert>-->
<el-row :gutter="0" style="margin-top: 15px">
<el-col :span="24" align="right">
@ -209,14 +209,14 @@
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane>
<!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode-->
<!-- v-if="panelALive"-->
<!-- :fifoSplit="3"-->
<!-- :prescribeData="curRow"-->
<!-- :refreshPanel="refreshCodesPanelP"-->
<!-- ></PanelOrderManuTagCode>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode-->
<!-- v-if="panelALive"-->
<!-- :fifoSplit="3"-->
<!-- :prescribeData="curRow"-->
<!-- :refreshPanel="refreshCodesPanelP"-->
<!-- ></PanelOrderManuTagCode>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="拆零详情">
<prescribeCodePanel
v-if="panelALive"
@ -279,9 +279,9 @@
>
<div
style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"
@click="selectBusType(info.code)">
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p>
style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
@click="selectBusType(info.documentTypeCode)">
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
<!-- 假设你的信息对象中包含一个title属性 -->
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
<!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
@ -291,11 +291,11 @@
<!-- </div>-->
</div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
@click="selectBusType(info.code)">
@click="selectBusType(info.documentTypeCode)">
<!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p>
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.documentTypeCode }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.code)">开始作业
@click="selectBusType(info.documentTypeCode)">开始作业
</el-button>
</div>
@ -326,7 +326,7 @@ import {enterCodeWeb} from "@/api/inout/order";
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
import {getCurOrder, getNextOrder,findByBill} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
@ -365,7 +365,7 @@ export default {
curWorkPlaces: [],
erpList: [],
formData: {
billNo: null,
billNo:null,
tagStatus: -1,
invCode: null,
busType: null,
@ -419,15 +419,16 @@ export default {
},
methods: {
getBillNo(billNo) {
let post = {
billNo: billNo,
page: 1,
limit: 10,
}
getBillNo(billNo,workPlaceCode){
let post = {
billNo: billNo,
workPlaceCode: workPlaceCode,
page: 1,
limit: 10,
}
findByBill(post).then(res => {
if (res.code == 20000) {
if (res.data.list.length > 0) {
if (res.data.list.length > 0){
this.formData = res.data.list[0]
}
}
@ -455,9 +456,10 @@ export default {
if (this.formDataVisible.scanType == 1) {
this.findFromInvList("");
}
if (this.formData.billNo != null) {
this.getBillNo(this.formData.billNo)
} else {
if (this.formData.billNo != null){
this.getBillNo(this.formData.billNo,this.formData.workplaceCode)
this.startDeal();
}else {
this.findCurOrder();
}
@ -690,39 +692,25 @@ export default {
});
},
confirmFinishOrder() {
finishOrder() {
this.$confirm('是否确定完成此单据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.finishOrder()
finishOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.formData = {tagStatus: -1};
this.curRow = null
this.refreshCodesPanel(this)
}
}).catch(() => {
this.loading = false
})
}).catch(() => {
});
},
finishOrder() {
finishOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.formData = {tagStatus: -1};
this.curRow = null
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
} else if (res.code == 502) {
this.$confirm(res.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.formData.confirmFinish = true;
this.finishOrder();
}).catch(() => {
});
}
}).catch(() => {
this.loading = false
})
},
updateOrder() {
@ -893,6 +881,8 @@ export default {
}
}
}

30
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -25,12 +25,12 @@
</el-row>
<el-alert
style="margin-top: 15px"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<!-- <el-alert-->
<!-- style="margin-top: 15px"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!--</el-alert>-->
<el-row :gutter="0" style="margin-top: 15px">
<el-col :span="24" align="right">
@ -279,9 +279,9 @@
>
<div
style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"
@click="selectBusType(info.code)">
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p>
style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
@click="selectBusType(info.documentTypeCode)">
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
<!-- 假设你的信息对象中包含一个title属性 -->
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
<!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
@ -291,11 +291,11 @@
<!-- </div>-->
</div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
@click="selectBusType(info.code)">
@click="selectBusType(info.documentTypeCode)">
<!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p>
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.documentTypeCode }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.code)">开始作业
@click="selectBusType(info.documentTypeCode)">开始作业
</el-button>
</div>
@ -418,9 +418,10 @@ export default {
},
methods: {
getBillNo(billNo){
getBillNo(billNo,workPlaceCode){
let post = {
billNo: billNo,
workPlaceCode: workPlaceCode,
page: 1,
limit: 10,
}
@ -455,7 +456,8 @@ export default {
this.findFromInvList("");
}
if (this.formData.billNo != null){
this.getBillNo(this.formData.billNo)
this.getBillNo(this.formData.billNo,this.formData.workplaceCode)
this.startDeal();
}else {
this.findCurOrder();
}

5
src/views/collect/PanelOrderManuTagCode.vue
Unescape Escape View File

@ -212,8 +212,9 @@ export default {
codeRemove(post).then((response) => {
if (response.code === 20000) {
this.$message.success("操作成功！");
this.refreshPanel(this)
this.getList()
// this.refreshPanel(this)
this.getList(this);
this.closeScanDialog()
} else {
this.$message.error(response.message);
}

1
src/views/collect/PannelOrderBiz.vue
Unescape Escape View File

@ -292,6 +292,7 @@ export default {
closeScanDialog() {
this.getPrescribeDetail(this);
this.refreshPanel(this)
},
rowStyle({row, rowIndex}) {

Write Preview
Loading…
Cancel
Save