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

修改采购管理bug

Browse Source
tagView
zhengmingliang 2 years ago
parent 8d0a9aa20d
commit 73139fab08
10 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
src/views/purchase/purApply.vue
Unescape Escape View File

@ -88,7 +88,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

17
src/views/purchase/purApplyEditDiaolog.vue
Unescape Escape View File

@ -85,7 +85,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3" >
<div class="ao-text"> <div class="ao-text">
<span>申购说明：</span> <span>申购说明：</span>
</div> </div>
@ -96,6 +96,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px" v-show="formData.status==4">
<el-col :span="3">
<div class="ao-text">
<span>拒绝原因：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item >
<el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
@ -273,7 +286,7 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
if (status === '0') { if (status === '2') {
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');

2
src/views/purchase/purPlan.vue
Unescape Escape View File

@ -88,7 +88,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

4
src/views/purchase/purPlanAudit.vue
Unescape Escape View File

@ -61,7 +61,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled=" scope.row.status==3" :disabled=" scope.row.status!=2"
@click.native="newDistributionForm(scope.$index, scope.row)" @click.native="newDistributionForm(scope.$index, scope.row)"
>审核 >审核
</el-button </el-button
@ -83,7 +83,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

13
src/views/purchase/purPlanEditDialog.vue
Unescape Escape View File

@ -120,6 +120,17 @@
<el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input> <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
  <el-col :span="3" v-show="formData.status==4">
<div class="ao-text">
                            <span>拒绝原因：</span>
                        </div>
                    </el-col>
                    <el-col :span="7" v-show="formData.status==4">
                        <el-form-item >
                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
                        </el-form-item>
                    </el-col>
</el-row> </el-row>
@ -299,7 +310,7 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
if (status === '0') { if (status === '2') {
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');

2
src/views/purchase/purPlanSearch.vue
Unescape Escape View File

@ -82,7 +82,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

3
src/views/purchase/pureApplyAudit.vue
Unescape Escape View File

@ -69,6 +69,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
:disabled="scope.row.status!=2"
size="small" size="small"
@click.native="newDistributionForm(scope.$index, scope.row)" @click.native="newDistributionForm(scope.$index, scope.row)"
>审核 >审核
@ -91,7 +92,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

1
src/views/purchase/pureApplyDetailDialog.vue
Unescape Escape View File

@ -281,6 +281,7 @@ export default {
targetInv: null, targetInv: null,
targetSubInv: null, targetSubInv: null,
targetBillType:null, targetBillType:null,
auditRemark:"",
}, },
formRules: {}, formRules: {},
codeArray: [], codeArray: [],

10
src/views/purchase/pureApplySearch.vue
Unescape Escape View File

@ -11,14 +11,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.status" placeholder="审核状态">
<el-option label="全部" value=""></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">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker <el-date-picker
@ -90,7 +82,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <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="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

2
src/views/thrsys/thrOrderNew.vue
Unescape Escape View File

@ -475,7 +475,7 @@ export default {
} }
if (status === '0') { if (status === '2') {
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');

Write Preview
Loading…
Cancel
Save