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

1.同步busUser分支的bug修复

Browse Source
feature-order-fix
x_z 3 years ago
parent 78ab5976fa
commit 62889b5c29
8 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File

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

@ -59,7 +59,7 @@
<el-col :span="18" class="el-col"> <el-col :span="18" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag" style="width: 200px;"> <div class="itemTag" style="width: 200px;">
<span>第三方服务IP地址:&nbsp;</span> <span v-text="inputQuery.thirdName + 'IP地址: '"></span>
</div> </div>
<el-input <el-input
@ -122,7 +122,7 @@
<el-col :span="18" class="el-col"> <el-col :span="18" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag" style="width: 200px;"> <div class="itemTag" style="width: 200px;">
<span>第三方服务接口授权:&nbsp;</span> <span v-text="inputQuery.thirdName + '接口授权:'">&nbsp;</span>
</div> </div>
</div> </div>
</el-col> </el-col>

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

@ -256,7 +256,7 @@
</el-checkbox> </el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存 <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
</el-checkbox> </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>
<el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验 <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
</el-checkbox> </el-checkbox>

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

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

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

@ -152,13 +152,6 @@
@click.native="rollback(scope.row)" @click.native="rollback(scope.row)"
>撤回 >撤回
</el-button> --> </el-button> -->
<el-button
v-if="scope.row.uploadFlag"
type="text"
size="small"
@click.native.stop="uploadSpms(scope.row)"
>提交
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@ -183,7 +183,12 @@ export default {
return { return {
listQuery: { listQuery: {
purType: null, purType: null,
billNo: "", udiCode: null,
unicode: null,
cpmctymc: null,
ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
page: 1, page: 1,
limit: 10, limit: 10,
}, },
@ -249,12 +254,20 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
this.listQuery.udiCode=null this.listQuery = {
this.listQuery.unionCode=null purType: null,
this.listQuery.cpmctymc=null udiCode: null,
this.listQuery.ggxh=null unicode: null,
this.listQuery.ylqxzcrbarmc=null cpmctymc: null,
this.listQuery.thrPiId=null ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
page: 1,
limit: 10
}
this.multipleSelection = [];
this.radioCheck = null;
this.currentRow = null;
this.getList(); this.getList();
}, },
tableRowClassName({row}) { tableRowClassName({row}) {
@ -345,7 +358,7 @@ export default {
this.$message.error('未选择产品'); this.$message.error('未选择产品');
return; return;
} }
if(this.ids.length>0){ if(this.ids.length>0){
for(var i=0;i<this.ids.length;i++){ for(var i=0;i<this.ids.length;i++){
if(this.ids[i]==this.multipleSelection.rlId){ if(this.ids[i]==this.multipleSelection.rlId){
@ -403,7 +416,7 @@ export default {
this.multipleSelection.zczbhhzbapzbh = this.currentCert; this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine(); this.combine();
} }
}, },
}, },
components: {udiRlDetailDialog}, components: {udiRlDetailDialog},

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

@ -651,7 +651,7 @@ export default {
code: this.formData.code.trim(), code: this.formData.code.trim(),
} }
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
@ -700,7 +700,7 @@ export default {
}); });
}, },
addCode(event) { addCode(event) {
this.originCode = ""; this.originCode = "";
this.sictomText = ""; this.sictomText = "";
this.formData.corpOrderId = this.formData.corpOrderId.trim(); this.formData.corpOrderId = this.formData.corpOrderId.trim();
@ -765,7 +765,7 @@ export default {
}, },
addCodeSubmit(tQuery) { addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => { addOrderWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.idQuery.id = response.data.orderId; this.idQuery.id = response.data.orderId;
@ -831,13 +831,15 @@ export default {
message: "提交失败！" + this.editTitle, message: "提交失败！" + this.editTitle,
customClass: 'messageIndex' customClass: 'messageIndex'
}); });
} else { } else {
this.$message({ this.$alert(response.message, '提示', {
type: 'error', confirmButtonText: '确定',
message: "提交失败！" + this.editTitle, type: 'warning',
customClass: 'messageIndex' closeOnClickModal: true,
callback: action => {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
}
}); });
} }
} }
@ -930,7 +932,7 @@ export default {
} }
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.formData.action != null) { if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action); this.curAction = this.getActionItem(this.formData.action);
@ -968,7 +970,7 @@ export default {
} }
, ,
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
@ -1099,7 +1101,7 @@ export default {
} }
, ,
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.findMethod(); this.findMethod();
@ -1223,11 +1225,11 @@ export default {
} }
, ,
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];
this.getStorage(this.formData.action); this.getStorage(this.formData.action);
if (this.$isNotBlank(this.idQuery.id)) { if (this.$isNotBlank(this.idQuery.id)) {

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

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

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

@ -39,16 +39,8 @@
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billdate"> <el-form-item prop="billNo">
<el-date-picker <el-input v-model="formData.billDate" auto-complete="off" :disabled="true"></el-input>
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> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -267,7 +259,7 @@ export default {
} }
if (status === '0') { if (status === '0') {
for (let i = 0; i < this.codeArray.length; i++) { 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'); return this.$message.error('单据数量不能为0');
} }
} }
@ -275,6 +267,16 @@ export default {
if (status == "1") { if (status == "1") {
this.submitFunction(status); this.submitFunction(status);
} else { } 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 = "是否确定提交订单?"; let tip = "是否确定提交订单?";
this.$confirm(tip, "提示", { this.$confirm(tip, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -419,6 +421,8 @@ export default {
this.query.limit = 100; this.query.limit = 100;
this.query.orderIdFk = this.idQuery.id; this.query.orderIdFk = this.idQuery.id;
this.formData = this.idQuery.formData; this.formData = this.idQuery.formData;
this.formData.billNo = this.idQuery.formData.recordKey;
this.formData.billDate = this.idQuery.formData.createTime;
this.orderEditor = true; this.orderEditor = true;
this.sValue = this.formData.corpName; this.sValue = this.formData.corpName;
this.getStockOrderDetailList(); this.getStockOrderDetailList();

Write Preview
Loading…
Cancel
Save