master
anthonyywj2 3 years ago
parent 604060ac7e
commit fdefbad953

@ -1,6 +1,6 @@
{ {
"UDI_SYNC_SERVER_IP": "http://192.168.0.105:9995/", "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
"BASE_URL":"http://192.168.0.105:9991/", "BASE_URL":"http://192.168.0.109:9991",
"SERVER_IP": "http://192.168.0.105:9991/", "SERVER_IP": "http://192.168.0.109:9991/",
"WEBSOCKET_URL": "ws://192.168.0.105:9991/UDI_WMS_MC/api/websocket/" "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
} }

@ -7,7 +7,7 @@ export function getCompany() {
}); });
} }
export function modifyComapny(query) { export function modifyCompany(query) {
return axios({ return axios({
url: "/warehouse/info/modifyCompany", url: "/warehouse/info/modifyCompany",
method: "post", method: "post",

@ -12,15 +12,6 @@
<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="单据号"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="单据状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="草稿" value="1"></el-option>-->
<!-- <el-option label="未配货" value="2"></el-option>-->
<!-- <el-option label="待校验" value="3"></el-option>-->
<!-- <el-option label="已校验" value="4"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini"> <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option <el-option
@ -131,16 +122,14 @@
>发票 >发票
</el-button </el-button
> >
<!-- <el-button--> <el-button
<!-- type="text"--> v-if="isSp ==110"
<!-- size="small"--> type="text"
<!-- @click.native="generOrder(scope.row)"--> size="small"
<!-- >复制--> @click.native="generOrder(scope.row)"
<!-- </el-button--> >复制
<!-- >--> </el-button
>
<!-- v-if="haveDistributionVisible"-->
<div v-if="scope.row.enableSupplementOrder"> <div v-if="scope.row.enableSupplementOrder">
<el-button <el-button
@ -854,15 +843,15 @@ export default {
type: 'warning', type: 'warning',
center: true, center: true,
}).then(() => { }).then(() => {
this.$message({
type: 'success',
message: '补单成功!'
});
// //
let orderQuery = { let orderQuery = {
billNo: row.billNo billNo: row.billNo
} }
supplementOrder(orderQuery); supplementOrder(orderQuery);
this.$message({
type: 'success',
message: '补单成功!'
});
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',

@ -171,7 +171,7 @@
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.preCheck" <el-checkbox v-model="formData.preCheck"
:disabled="!curAction.changeEnable ||corpOrderIdDisabled" :disabled="corpOrderIdDisabled || curAction.corpType !=2"
>是否只采集预验收产品 >是否只采集预验收产品
</el-checkbox> </el-checkbox>
</div> </div>

@ -31,9 +31,31 @@
</el-form> </el-form>
<el-dialog title="手持终端服务IP地址设置" :visible.sync="qrCodeVisible" width="27%"> <el-dialog title="手持终端服务IP地址设置" :visible.sync="qrCodeVisible" width="27%">
<div id="qrCodeUrl"></div> <div id="qrCodeUrl"></div>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
<el-col :span="24" class="el-col">
<div class="text item">
<div class="itemTag">
<span>当前系统:&nbsp;</span>
</div>
<el-input
style="width: 60%"
size="small"
placeholder="请输入内容"
clearable
v-model="companyInfo.name"
></el-input>
</div>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" icon="search" @click="saveNameClick"
>保存
</el-button
>
<el-button @click="qrCodeVisible = false">取消</el-button> <el-button @click="qrCodeVisible = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
@ -184,6 +206,8 @@
import {registerList, check, deleterKey} from "../../../api/auth/deviceCheck"; import {registerList, check, deleterKey} from "../../../api/auth/deviceCheck";
import QRCode from 'qrcodejs2' import QRCode from 'qrcodejs2'
import axios from "axios"; import axios from "axios";
import store from "@/store";
import {getCompany, modifyCompany} from "@/api/inout/company";
export default { export default {
data() { data() {
@ -213,6 +237,7 @@ export default {
editDialogVisible: false, editDialogVisible: false,
qrCodeVisible: false, qrCodeVisible: false,
serverUrl: false, serverUrl: false,
companyInfo: {},
}; };
}, },
@ -328,6 +353,13 @@ export default {
this.centerDialogVisible = false; this.centerDialogVisible = false;
}, },
qrCodeGeneration() { qrCodeGeneration() {
let tquery = {
customerId: 110,
};
getCompany(tquery).then((response) => {
this.loading = false;
this.companyInfo = response.data;
});
this.qrCodeVisible = true; this.qrCodeVisible = true;
this.$nextTick(function () { this.$nextTick(function () {
document.getElementById("qrCodeUrl").innerHTML = ""; document.getElementById("qrCodeUrl").innerHTML = "";
@ -339,6 +371,14 @@ export default {
colorLight: "#fff" colorLight: "#fff"
}); });
}); });
},
saveNameClick() {
modifyCompany(this.companyInfo).then((response) => {
if (response.code == 20000) {
this.$message.success("保存成功!");
this.qrCodeVisible = false;
}
});
} }
}, },

Loading…
Cancel
Save