测试问题修改4
This commit is contained in:
parent
e6d3a33c96
commit
aa81840f1c
|
|
@ -17,7 +17,7 @@
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.materialCode"
|
v-model="form.materialCode"
|
||||||
placeholder="请输入商品编号"
|
placeholder="请输入商品编号"
|
||||||
maxlength="40"
|
maxlength="20"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.materialName"
|
v-model="form.materialName"
|
||||||
placeholder="请输入商品名称"
|
placeholder="请输入商品名称"
|
||||||
maxlength="40"
|
maxlength="20"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -376,7 +376,9 @@ export default {
|
||||||
created() {
|
created() {
|
||||||
if(this.$route.query.purchaseInspectionRowData){
|
if(this.$route.query.purchaseInspectionRowData){
|
||||||
this.purchaseInspectionRowData = JSON.parse(this.$route.query.purchaseInspectionRowData)
|
this.purchaseInspectionRowData = JSON.parse(this.$route.query.purchaseInspectionRowData)
|
||||||
this.getContractInfo()
|
setTimeout(()=>{
|
||||||
|
this.getContractInfo()
|
||||||
|
},500)
|
||||||
}
|
}
|
||||||
this.getAreaTreeData()
|
this.getAreaTreeData()
|
||||||
this.getMaterialTree()
|
this.getMaterialTree()
|
||||||
|
|
@ -783,8 +785,14 @@ export default {
|
||||||
param.type = 'canteen'
|
param.type = 'canteen'
|
||||||
imgUpLoadTwo(param).then((res) => {
|
imgUpLoadTwo(param).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
console.log(this.attachmentList)
|
||||||
|
console.log(this.baseInfo.inspectAttachmentList)
|
||||||
this.attachmentList.push(res.data)
|
this.attachmentList.push(res.data)
|
||||||
this.baseInfo.inspectAttachmentList.push(res.data.url)
|
if(!this.baseInfo.inspectAttachmentList){
|
||||||
|
this.baseInfo.inspectAttachmentList=[res.data.url]
|
||||||
|
}else{
|
||||||
|
this.baseInfo.inspectAttachmentList.push(res.data.url)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.$modal.msgError(res.msg);
|
this.$modal.msgError(res.msg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -410,7 +410,9 @@ export default {
|
||||||
created() {
|
created() {
|
||||||
if(this.$route.query.purchaseOrderRowData){
|
if(this.$route.query.purchaseOrderRowData){
|
||||||
this.purchaseOrderRowData = JSON.parse(this.$route.query.purchaseOrderRowData)
|
this.purchaseOrderRowData = JSON.parse(this.$route.query.purchaseOrderRowData)
|
||||||
this.getContractInfo()
|
setTimeout(()=>{
|
||||||
|
this.getContractInfo()
|
||||||
|
},800)
|
||||||
}
|
}
|
||||||
this.getAreaTreeData()
|
this.getAreaTreeData()
|
||||||
this.getMaterialTree()
|
this.getMaterialTree()
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
|
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="库存数量" align="center" prop="inventoryNum" :show-overflow-tooltip="true" />
|
<el-table-column label="库存数量" align="center" prop="materialTotalNum" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
|
<el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
|
||||||
<!-- <template slot-scope="scope">
|
<!-- <template slot-scope="scope">
|
||||||
<span v-if="scope.row.salesMode==1">按份</span>
|
<span v-if="scope.row.salesMode==1">按份</span>
|
||||||
|
|
@ -233,12 +233,14 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getAreaTreeData()
|
|
||||||
this.getMaterialTree()
|
|
||||||
if(this.$route.query.purchasePlanRowData){
|
if(this.$route.query.purchasePlanRowData){
|
||||||
this.purchasePlanRowData = JSON.parse(this.$route.query.purchasePlanRowData)
|
this.purchasePlanRowData = JSON.parse(this.$route.query.purchasePlanRowData)
|
||||||
this.getContractInfo()
|
setTimeout(()=>{
|
||||||
|
this.getContractInfo()
|
||||||
|
},500)
|
||||||
}
|
}
|
||||||
|
this.getAreaTreeData()
|
||||||
|
this.getMaterialTree()
|
||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
'$route.query.purchasePlanRowData':function(newId, oldId) {
|
'$route.query.purchasePlanRowData':function(newId, oldId) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue