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

bug修改，业务单据打印功能

Browse Source
fencang
anthonywj 3 years ago
parent 1990577d08
commit 5000ad82b4
7 changed files with 43 additions and 81 deletions
Show Stats Download Patch File Download Diff File

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

@ -11,7 +11,7 @@
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
:disabled="!isAdd" :disabled="!isAdd"
v-model="inputQuery.name" v-model.trim="inputQuery.name"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -25,7 +25,7 @@
:disabled="!isAdd" :disabled="!isAdd"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="inputQuery.action" v-model.trim="inputQuery.action"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>

4
src/views/thrsys/ThrInvWarehouse.vue
Unescape Escape View File

@ -128,13 +128,13 @@
<el-form-item label="仓库编码" prop="title" class="query-form-item"> <el-form-item label="仓库编码" prop="title" class="query-form-item">
<el-input <el-input
v-model="formData.code" style="width: 80%" v-model.trim="formData.code" style="width: 80%"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="仓库名称" prop="name" class="query-form-item"> <el-form-item label="仓库名称" prop="name" class="query-form-item">
<el-input <el-input
v-model="formData.name" style="width: 80%" v-model.trim="formData.name" style="width: 80%"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>

30
src/views/thrsys/ThrProductsAdd.vue
Unescape Escape View File

@ -41,7 +41,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.code" v-model.trim="newProductData.code"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -54,7 +54,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.name" v-model.trim="newProductData.name"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -72,7 +72,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.spec" v-model.trim="newProductData.spec"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -86,7 +86,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.measname" v-model.trim="newProductData.measname"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -104,7 +104,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.manufactory" v-model.trim="newProductData.manufactory"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -117,7 +117,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.registerNo" v-model.trim="newProductData.registerNo"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -133,7 +133,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ylqxzcrbarmc" v-model.trim="newProductData.ylqxzcrbarmc"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -146,7 +146,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ylqxzcrbarywmc" v-model.trim="newProductData.ylqxzcrbarywmc"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -162,7 +162,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.cplb" v-model.trim="newProductData.cplb"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -175,7 +175,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.flbm" v-model.trim="newProductData.flbm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -192,7 +192,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.sptm" v-model.trim="newProductData.sptm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -205,7 +205,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ybbm" v-model.trim="newProductData.ybbm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -221,7 +221,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.tyshxydm" v-model.trim="newProductData.tyshxydm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -234,7 +234,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.qxlb" v-model.trim="newProductData.qxlb"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -254,7 +254,7 @@
size="mini" size="mini"
rows="4" rows="4"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.cpms" v-model.trim="newProductData.cpms"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>

67
src/views/userManage/param/systemPDFModule.vue
Unescape Escape View File

@ -120,6 +120,14 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">
<template slot-scope="scope">
<el-select v-model="scope.row.printType" placeholder="打印方式">
<el-option label="批次号" :value=0></el-option>
<el-option label="条码清单" :value=1></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true"> <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1" <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
@ -200,71 +208,12 @@
> >
<el-form :model="formData" :rules="formRules" ref="dataForm"> <el-form :model="formData" :rules="formRules" ref="dataForm">
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>模板名称：</span>-->
<!-- </div>-->
<!-- <div class="ao-text">-->
<!-- <span>模板名称：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="name">-->
<!-- <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属模块" prop="type">-->
<!-- <el-select v-model="formData.type" placeholder="所属模块">-->
<!-- <el-option label="订单详情" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>备注：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="type">-->
<!-- <el-input type="textarea" v-model="formData.remark" rows=6></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-form-item label="模板名称" prop="name"> <el-form-item label="模板名称" prop="name">
<el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input> <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input type="textarea" v-model="formData.remark" rows=6></el-input> <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="所属模块" prop="type">-->
<!-- <el-select v-model="formData.type" placeholder="所属模块">-->
<!-- <el-option label="订单详情" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>表格行数：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="uploadUrl">-->
<!-- <el-input-number v-model="formData.rowCount" :min="1" :max="30" label=""></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>二维码数量：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="uploadUrl">-->
<!-- <el-input-number v-model="formData.qrcodeCount" :min="1" :max="100" label=""></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">

9
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -213,11 +213,9 @@
>出入库必须校验预验收库 >出入库必须校验预验收库
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.vailInv" <el-checkbox v-model="formData.vailInv"
:disabled="corpOrderIdDisabled"
>是否查询库存 >是否查询库存
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.codeFillCheck" <el-checkbox v-model="formData.codeFillCheck"
:disabled="corpOrderIdDisabled"
>采集UDI码时进行三期校验 >采集UDI码时进行三期校验
</el-checkbox> </el-checkbox>
</div> </div>
@ -479,6 +477,8 @@ export default {
invWarehouseCode: null, invWarehouseCode: null,
subInvCode: null, subInvCode: null,
fromSubInvCode: null, fromSubInvCode: null,
codeFillCheck: null,
vailInv: null,
}, },
editOriginCodeVisible: false, editOriginCodeVisible: false,
@ -871,6 +871,11 @@ export default {
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);
if (this.curAction != null) {
this.formData.vailInv = this.curAction.vailInv;
this.formData.codeFillCheck = this.curAction.codeFillCheck;
}
} }
}) })
.catch(() => { .catch(() => {

9
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -134,7 +134,6 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="formData.codeFillCheck" <el-checkbox v-model="formData.codeFillCheck"
:disabled="corpOrderIdDisabled"
>采集UDI码时进行三期校验 >采集UDI码时进行三期校验
</el-checkbox> </el-checkbox>
</div> </div>
@ -376,6 +375,10 @@ export default {
expireDate: null, expireDate: null,
serialNo: null, serialNo: null,
count: null, count: null,
codeFillCheck: null,
vailInv: null,
subInvCode: null,
fromSubInvCode: null,
}, },
formRules: { formRules: {
temp: [ temp: [
@ -760,6 +763,10 @@ export default {
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.curAction = this.busTypes[0]; this.curAction = this.busTypes[0];
if (this.curAction != null) {
this.formData.vailInv = this.curAction.vailInv;
this.formData.codeFillCheck = this.curAction.codeFillCheck;
}
this.getStorage(this.formData.billType); this.getStorage(this.formData.billType);
// this.getList(); // this.getList();
}) })

1
src/views/warehouse/editCode.vue
Unescape Escape View File

@ -79,6 +79,7 @@
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="editData.count" auto-complete="off" <el-input v-model="editData.count" auto-complete="off"
type="number" type="number"
min="1"
:disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input> :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

Write Preview
Loading…
Cancel
Save