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

Merge remote-tracking branch 'origin/busUser' into wms_pzh

Browse Source 
# Conflicts:
#	public/config.json
#	src/views/basic/BussinessTypeModify.vue
#	src/views/inout/IOAddOrder.vue
wms_pzh
x_z 2 years ago
parent 345f035d09 31725f2565
commit c37f22b0f2
36 changed files with 362 additions and 138 deletions
Show Stats Download Patch File Download Diff File

8
public/config.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9991/",
"BASE_URL": "http://192.168.0.109:9991",
"SERVER_IP": "http://192.168.0.109:9991",
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
"UDI_SYNC_SERVER_IP": "http://192.168.0.166:9991/",
"BASE_URL":"http://192.168.0.166:9991",
"SERVER_IP": "http://192.168.0.166:9991/",
"WEBSOCKET_URL": "ws://192.168.0.166:9991/UDI_WMS_MC/api/websocket/",
"hosp_name": "平和县医院"
}

8
src/api/thrsys/spsSyncDownload.js
Unescape Escape View File

@ -24,3 +24,11 @@ export function findConfig(query) {
params: query
});
}
export function downloadNow(params) {
return axios({
url: "/spsync/download/now",
method: "get",
params: params
});
}

11
src/utils/date.js
Unescape Escape View File

@ -22,3 +22,14 @@ export function formatDate (date, fmt) {
function padLeftZero (str) {
return ('00' + str).substr(str.length);
};
export function convertDate(date) {
if(date!=null && date!=undefined && date.length>5){
var time="20"+date.substring(0,2)+"-"+date.substring(2,4)+"-"+date.substring(4,6);
return time;
}else{
return date;
}
};

28
src/views/basic/BasicThirdSysModify.vue
Unescape Escape View File

@ -79,17 +79,27 @@
<el-col :span="18" class="el-col">
<div class="text item">
<div class="itemTag" style="width: 200px;">
<span>第三方系统IP地址:&nbsp;</span>
<span v-text="inputQuery.thirdName + 'IP地址: '"></span>
</div>
<el-input
style="width: 70%;margin-left: -80px;"
size="mini"
splaceholder="请输入内容"
v-model="inputQuery.thirdSysUrl"
></el-input>
</div>
</el-col>
</el-row>
<el-button style="margin-left: 5px;" type="primary" @click="testThirdInter">测试连通性</el-button>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="18" class="el-col" style="margin-left: 60px;">
<div class="text item">
<el-row>
<label style="width: 80px;">IP地址：</label>
<el-input
style="width: 40%;"
size="mini"
splaceholder="请输入内容"
v-model="inputQuery.thirdSysUrl"
></el-input>
<el-button style="margin-left: 5px;" type="primary" @click="testThirdInter">测试连通性</el-button>
</el-row>
</div>
</el-col>
</el-row>
@ -122,7 +132,7 @@
<el-col :span="18" class="el-col">
<div class="text item">
<div class="itemTag" style="width: 200px;">
<span>第三方服务接口授权:&nbsp;</span>
<span v-text="inputQuery.thirdName + '接口授权:'">&nbsp;</span>
</div>
</div>
</el-col>

6
src/views/basic/BussinessTypeLoclModify.vue
Unescape Escape View File

@ -455,6 +455,7 @@ export default {
this.editQuery = JSON.parse(JSON.stringify(row));
this.editChangeTypeVisible = true;
this.getBusTypes();
this.findDefaultSubInv();
}
,
hideForm() {
@ -527,6 +528,7 @@ export default {
});
},
findDefaultSubInv() {
this.subInvList = [];
let query = {
pcode: this.editQuery.defaultInv
@ -539,8 +541,7 @@ export default {
});
},
invChange() {
if (this.$isNotBlank(this.inputQuery.defaultSubInv))
this.inputQuery.defaultSubInv = null;
this.editQuery.defaultSubInv = null;
this.findDefaultSubInv();
},
},
@ -549,6 +550,7 @@ export default {
this.getTypes();
this.getList();
this.getStorage();
}
}
;

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

@ -171,36 +171,36 @@
<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.defaultInv" placeholder="默认仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- style="width: 30%"-->
<!-- size="small">-->
<!-- <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-select v-model="inputQuery.defaultSubInv" placeholder="默认分库" clearable="true"-->
<!-- style="width: 30%"-->
<!-- size="small">-->
<!-- <el-option-->
<!-- v-for="item in subInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.defaultInv" placeholder="默认仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- style="width: 30%"-->
<!-- size="small">-->
<!-- <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-select v-model="inputQuery.defaultSubInv" placeholder="默认分库" clearable="true"-->
<!-- style="width: 30%"-->
<!-- size="small">-->
<!-- <el-option-->
<!-- v-for="item in subInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="10" class="el-col">
<div class="text item">
@ -223,8 +223,7 @@
<div class="text item" style="margin-top: 6px">
<el-checkbox v-model="inputQuery.enable" :disabled="inputQuery.localAction==null">启用单据类型
</el-checkbox>
<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">以使用单元计量出库
@ -257,8 +256,7 @@
</el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
</el-checkbox>
<el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">
是否允许无库存出库
<el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否只允许有库存产品出库
</el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
</el-checkbox>

1
src/views/basic/UdIInfoSelect.vue
Unescape Escape View File

@ -174,6 +174,7 @@
:data="detailList"
style="width: 100%; margin-top: 20px"
border
highlight-current-row
@current-change="handleDetail"
>
<el-table-column

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

@ -236,6 +236,7 @@
style="width: 100%; "
border
key="3"
highlight-current-row
@current-change="handleDetail"
>
<el-table-column
@ -1029,6 +1030,7 @@ export default {
productType: null,
editQuery: null,
productRemarkSet: {},
pId: 0,
relevanceEdit: {
id: null,
thirdId: "",
@ -1039,6 +1041,7 @@ export default {
allowNoBatch: null,
allowNoExpire: null,
allowNoProduct: null,
pId: null,
},
defaultSys: null,
isImport: false,
@ -1144,6 +1147,8 @@ export default {
this.loading = false;
this.detailList = response.data || [];
this.detailList.forEach((item, index, array) => {
this.detailList[index].isAdavence=item.adavence
this.detailList[index].isDisable=item.disable
if (item.zxxsbzbhsydysl > 1) {
this.isUseDyCheck = true;
}
@ -1360,6 +1365,7 @@ export default {
this.thisData = row;
this.editDialogVisible = true;
this.editQuery = row;
this.pId=row.id;
this.relevanceEdit = {
id: row.id,
// thirdId: row.thirdId,
@ -1472,6 +1478,7 @@ export default {
this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit = this.editQuery;
this.relevanceEdit.pid = this.pId;
if (this.checked == true) {
this.relevanceEdit.isUseDy = 1;
} else {
@ -1556,7 +1563,6 @@ export default {
selectUdiVersion,
},
created() {
this.findBasicProductSet();
this.getList();
this.selectSysParam();

1
src/views/basic/UdiInfoManageSp.vue
Unescape Escape View File

@ -207,6 +207,7 @@
:data="detailList"
style="width: 100%; margin-top: 20px"
border
highlight-current-row
key="3"
@current-change="handleDetail"
>

1
src/views/basic/UdiInfoRelevance.vue
Unescape Escape View File

@ -184,6 +184,7 @@
style="width: 100%"
@row-click="intentDetail"
v-loading="loading"
highlight-current-row
:row-class-name="tableRowClassName"
@selection-change="handleSelectionUdiChange"
>

1
src/views/basic/UdiInfoSelectUdi.vue
Unescape Escape View File

@ -69,6 +69,7 @@
style="width: 100%"
@row-click="intentDetail"
v-loading="loading"
highlight-current-row
:row-class-name="tableRowClassName"
@selection-change="handleSelectionUdiChange"
>

3
src/views/basic/UdiRlDetailDialog.vue
Unescape Escape View File

@ -421,6 +421,9 @@ export default {
},
created() {
if(this.editQuery.isUseDy==1){
this.checked=true
}
let ttquery = {
uuid: this.editQuery.uuid,
page: 1,

22
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -353,7 +353,7 @@
</div>
</el-dialog>
<!--添加单据类型弹窗---->
<!--添加单据类型弹窗-->
<el-dialog
@ -388,7 +388,7 @@
</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
@ -1103,9 +1103,9 @@ export default {
}
this.$message.success("操作成功");
this.formVisible = false;
if (this.formName !== "edit") {
if (response.data && response.data.id) {
data.id = response.data.id;
if (this.pidData) {
@ -1144,7 +1144,6 @@ export default {
this.subFormVisible = false;
} else {
this.$message.error(response.message);
this.subFormVisible = false;
}
}).catch(() => {
this.subFormVisible = false;
@ -1309,6 +1308,7 @@ export default {
},
changeLevel(row) {
this.formData.pcode = null;
this.formData.spUse = false;
//TODO
this.getParentInv(this.formData.level);
},
@ -1439,7 +1439,7 @@ export default {
var action=obj.toString();
this.bussinessTypeQuery.ids=action;
}
this.bussinessTypeQuery.code=this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = [];
@ -1540,12 +1540,16 @@ export default {
this.getBussinessType(1,action);
},
selsectBussinessType(row){
if (this.currentRow.id !== row.id) {
this.$message.error("请先选择需要操作的分库！");
return;
}
var busQuery = {
code: this.currentCode,
page: 1,
limit: 50
}
};
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list;
}).catch((error) => {
@ -1596,7 +1600,7 @@ export default {
limit: 50
}
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list || [];
}).catch((error) => {
});

14
src/views/business/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -195,8 +195,16 @@
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -225,6 +233,7 @@ import {parseTime} from "@/filtres";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {stockOrderChange, stockOrderDetail} from "@/api/inout/stockOrder";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "DialogcChangeNewOrder",
@ -240,6 +249,7 @@ export default {
},
data() {
return {
convertDateFun:convertDate,
formData: {
corpOrderId: "",
code: "",

14
src/views/business/stockOrder.vue
Unescape Escape View File

@ -167,8 +167,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -372,11 +380,13 @@ import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrder",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

23
src/views/business/stockOrderDelSearch.vue
Unescape Escape View File

@ -152,13 +152,6 @@
@click.native="rollback(scope.row)"
>撤回
</el-button> -->
<el-button
v-if="scope.row.uploadFlag"
type="text"
size="small"
@click.native.stop="uploadSpms(scope.row)"
>提交
</el-button>
</template>
</el-table-column>
</el-table>
@ -191,10 +184,18 @@
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -353,11 +354,13 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import StockOrderEdit from "@/views/business/stockOrderEdit";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {uploadSpms} from "@/api/inout/order";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderDelSearch",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

14
src/views/business/stockOrderDelete.vue
Unescape Escape View File

@ -122,12 +122,20 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -227,11 +235,13 @@ import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "../../api/basic/invWarehouse";
import codeReplace from "./codeReplace";
import {convertDate} from "@/utils/date";
export default {
name: "stockOrderDelete",
data() {
return {
convertDateFun:convertDate,
query: {
billNo: "",
page: 1,

14
src/views/business/stockOrderEdit.vue
Unescape Escape View File

@ -154,8 +154,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -492,11 +500,13 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderEditor",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

14
src/views/business/stockOrderEditor.vue
Unescape Escape View File

@ -154,8 +154,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -511,11 +519,13 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderEditor",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

14
src/views/business/stockOrderNew.vue
Unescape Escape View File

@ -162,8 +162,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<!-- <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>-->
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -467,11 +475,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrder",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

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

@ -1214,10 +1214,10 @@ export default {
// });
// },
getBusType() {
if( this.formData.id==null){
this.formData.billType=null;
}
if(this.$isBlank(this.idQuery.id)){
this.formData.billType=null;
}
let query = {
code: this.formData.invWarehouseCode,
enabled: true,
@ -1383,6 +1383,13 @@ export default {
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}
//判断有没有仓库再执行
if(this.formData.locStorageCode!=null){
this.findStorageMethod();
}
this.getStorage();
this.findSubInvByInv();
this.findSubStorageMethod();

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

@ -178,15 +178,14 @@ export default {
data() {
return {
listQuery: {
billNo: "",
udiCode: null,
unicode: null,
cpmctymc: null,
ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
page: 1,
limit: 10,
},
combineQuery: {
thirdId: "",
relId: "",
erpName: "",
keys: [],
limit: 10
},
ids:[],
radioCheck: null,
@ -244,12 +243,19 @@ export default {
this.$router.push({
path: "",
});
this.listQuery.udiCode=null
this.listQuery.unionCode=null
this.listQuery.cpmctymc=null
this.listQuery.ggxh=null
this.listQuery.ylqxzcrbarmc=null
this.listQuery.thrPiId=null
this.listQuery = {
udiCode: null,
unicode: null,
cpmctymc: null,
ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
page: 1,
limit: 10
}
this.multipleSelection = [];
this.radioCheck = null;
this.currentRow = null;
this.getList();
},
tableRowClassName({row}) {
@ -289,6 +295,10 @@ export default {
getList() {
this.loading = true;
this.listQuery.customerId = store.getters.customerId;
if( this.data.companyName!=undefined && this.data.companyName!=null ){
this.listQuery.companyName = this.data.companyName;
}
if (this.filterType != null && this.filterType === 2) {
filterAllProduct(this.listQuery)
@ -340,7 +350,7 @@ export default {
this.$message.error('未选择产品');
return;
}
if(this.ids.length>0){
for(var i=0;i<this.ids.length;i++){
if(this.ids[i]==this.multipleSelection.rlId){
@ -397,7 +407,7 @@ export default {
this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine();
}
},
},
components: {udiRlDetailDialog},

19
src/views/business/stockOrderSearch.vue
Unescape Escape View File

@ -168,10 +168,18 @@
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -495,11 +503,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import StockOrderEdit from "@/views/business/stockOrderEdit";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderSearch",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,
@ -1065,10 +1075,11 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let param = {billNo: row.billNo};
let param = {billNo: row.billNo,contrastStatus:2};
rollbackOrder(param).then((res) => {
if (res.code === 20000) {
this.$message.success("回退成功");
this.getList();
}
})
}).catch(() => {

14
src/views/business/stockOrderWaitCheck.vue
Unescape Escape View File

@ -148,8 +148,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -352,11 +360,13 @@ import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderWaitCheck",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

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

@ -918,6 +918,7 @@ export default {
this.$router.go(-1);
},
getBusType() {
this.formData.billType=null;
let query = {
code: this.formData.invWarehouseCode,
enabled: true,
@ -965,6 +966,7 @@ export default {
}
,
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,

14
src/views/inout/IOCheckErrorOrder.vue
Unescape Escape View File

@ -289,13 +289,21 @@
prop="productDate"
width="100"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="reCount"
@ -487,6 +495,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
const formJson = {
@ -505,6 +514,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
query: {
page: 1,
limit: 20,

11
src/views/inout/IOCheckWaitOrder.vue
Unescape Escape View File

@ -200,12 +200,17 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
><template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
> <template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template></el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -343,6 +348,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {convertDate} from "@/utils/date"
const formJson = {
site_id: "",
@ -360,6 +366,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
query: {
page: 1,
limit: 10,

14
src/views/inout/stockOrderChange.vue
Unescape Escape View File

@ -114,12 +114,20 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -223,11 +231,13 @@ import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import codeReplace from "../business/codeReplace";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderDelete",
data() {
return {
convertDateFun:convertDate,
query: {
billNo: "",
page: 1,

12
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

@ -185,12 +185,12 @@ export default {
getCodeList() {
this.loading = true;
this.query.orderIdFk = this.idQuery.orderIdFk;
debugger
let query = {
orderIdFk: this.idQuery.orderIdFk,
code:this.query.code
}
filterDetailProducts(query) //查找该单号下的所有条码
// let query = {
// orderIdFk: this.idQuery.orderIdFk,
// code:this.query.code
// }
filterDetailProducts(this.query) //查找该单号下的所有条码
.then((response) => {
this.loading = false;
this.codeArry = response.data.list || [];

4
src/views/inventory/innerOrder.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.recordKey"
placeholder="内部码打印单"
placeholder="单据号"
clearable
></el-input>
</el-form-item>
@ -270,13 +270,11 @@ export default {
listInnerOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
});
},
submitOrder(row) {

27
src/views/inventory/innerOrderEditDialog.vue
Unescape Escape View File

@ -39,16 +39,8 @@
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billdate">
<el-date-picker
v-model="formData.billDate"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
<el-form-item prop="billNo">
<el-input v-model="formData.billDate" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -189,6 +181,7 @@
import draggable from "vuedraggable";
import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
import {inserThrOrderWeb, delInnerOrderDetail, listInnerOrderDetail} from "@/api/inventory/innerOrder";
import {isBlank} from "@/utils/strUtil";
export default {
name: "idQuery",
@ -267,7 +260,7 @@ export default {
}
if (status === '0') {
for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
return this.$message.error('单据数量不能为0');
}
}
@ -275,6 +268,16 @@ export default {
if (status == "1") {
this.submitFunction(status);
} else {
if (this.codeArray.length < 1) {
this.$message.warning('未添加产品');
return;
}
for (let i = 0; i < this.codeArray.length; i++) {
if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
this.$message.error('单据数量不能为0');
return;
}
}
let tip = "是否确定提交订单?";
this.$confirm(tip, "提示", {
confirmButtonText: "确定",
@ -419,6 +422,8 @@ export default {
this.query.limit = 100;
this.query.orderIdFk = this.idQuery.id;
this.formData = this.idQuery.formData;
this.formData.billNo = this.idQuery.formData.recordKey;
this.formData.billDate = this.idQuery.formData.createTime;
this.orderEditor = true;
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();

4
src/views/inventory/invPreInProducts.vue
Unescape Escape View File

@ -34,7 +34,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderIdFk" placeholder="所属单号"></el-input>
</el-form-item>
</el-row>
<el-row style="width: 100%">

1
src/views/smp/UdiInfoSmpUpload.vue
Unescape Escape View File

@ -122,6 +122,7 @@
:data="detailList"
style="width: 100%; margin-top: 20px"
border
highlight-current-row
@current-change="handleDetail"
>
<el-table-column

22
src/views/thrsys/SysUdimsDownloadData.vue
Unescape Escape View File

@ -23,6 +23,14 @@
<el-button type="primary" icon="search" @click="getList">查询</el-button>
</el-button-group>
</el-form-item>
<el-form-item>
<el-button-group style="display:flex;">
<el-button type="primary" icon="search" @click="downloadNow(1)">立即下载基础信息</el-button>
<el-button type="primary" icon="search" @click="downloadNow(2)">立即下载单据类型</el-button>
<el-button type="primary" icon="search" @click="downloadNow(3)">立即下载扫码单据</el-button>
<el-button type="primary" icon="search" @click="downloadNow(4)">立即下载国家库信息</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
@ -128,6 +136,7 @@
import {filterLog, deleteLog, findConfig, updateConfig} from "../../api/thrsys/spsSyncDownload";
import store from "@/store";
import ShowText from "../other/showText";
import {downloadNow} from "../../api/thrsys/spsSyncDownload";
export default {
data() {
@ -339,6 +348,19 @@
this.syncInfo = item.remark;
}
})
},
downloadNow(type) {
//立即下载数据
let params = {type: type};
downloadNow(params).then((res) => {
if (res.code === 20000) {
this.$message.success("同步任务创建成功，稍后请刷新查看下载日志！");
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
})
}
},

14
src/views/thrsys/ThrOrdedrReceiveAdd.vue
Unescape Escape View File

@ -104,8 +104,16 @@
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
</el-table>
</el-card>
@ -142,10 +150,12 @@ import {
} from "../../api/inout/erpOrder";
import thrOrderNew from "./thrOrderNew";
import {getReceiveOrder} from "@/api/inout/receiveOrder";
import {convertDate} from "@/utils/date"
export default {
data() {
return {
convertDateFun:convertDate,
filterQuery: {
billAction: null,
billNo: "",

14
src/views/thrsys/ThrOrdedrReceiveSearch.vue
Unescape Escape View File

@ -88,8 +88,16 @@
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="reCount"></el-table-column>
<el-table-column label="实际数量" prop="count"></el-table-column>
</el-table>
@ -109,10 +117,12 @@ import {
getCloudErp,
} from "../../api/inout/erpOrder";
import {getReceiveOrder} from "@/api/inout/receiveOrder";
import {convertDate} from "@/utils/date"
export default {
data() {
return {
convertDateFun:convertDate,
filterQuery: {
billAction: null,
billNo: "",

Write Preview
Loading…
Cancel
Save