|
|
@@ -7,27 +7,10 @@
|
|
|
:display="display"
|
|
|
:form="queryParms"
|
|
|
:show="show"
|
|
|
+ :inDex="inDex"
|
|
|
:hidedata="hidedata"
|
|
|
@handleClick="handleClick"
|
|
|
/>
|
|
|
- <div style="width:40%;margin-left:60%;margin-bottom: -10%">
|
|
|
- <el-button
|
|
|
- type="cyan"
|
|
|
- icon="el-icon-search"
|
|
|
- size="mini"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索</el-button
|
|
|
- >
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- @click="handleClick"
|
|
|
- :icon="arrow"
|
|
|
- size="mini"
|
|
|
- >展开</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
<listComponent
|
|
|
style="clear:both"
|
|
|
v-if="waitFor"
|
|
|
@@ -42,9 +25,11 @@
|
|
|
@feedback="feedback"
|
|
|
:customButton="customButton"
|
|
|
:arrow="arrow"
|
|
|
+ :tatolLabel="mainTatol"
|
|
|
:seachButton="seachButton"
|
|
|
:setRowList="listStyle"
|
|
|
:listStyle="listStyle"
|
|
|
+ :isItHidden="isItHidden"
|
|
|
:queryList="queryList"/>
|
|
|
<pagination
|
|
|
v-show="total > 0"
|
|
|
@@ -61,7 +46,9 @@
|
|
|
:display="display"
|
|
|
:form="detailForm"
|
|
|
:show="show = true"
|
|
|
+ :inDex="inDex"
|
|
|
@backRules="backRules"
|
|
|
+ @backSave="backSave"
|
|
|
@handleClick="handleClick"
|
|
|
@verificationRules="verificationRules"
|
|
|
@changeWarehouse="changeWarehouse"
|
|
|
@@ -102,6 +89,7 @@ export default {
|
|
|
name: 'inStock',
|
|
|
data(){
|
|
|
return{
|
|
|
+ mainTatol:['金额'],
|
|
|
ids:[],
|
|
|
listData:{
|
|
|
fFeeid:[],
|
|
|
@@ -110,6 +98,7 @@ export default {
|
|
|
fWarehouseid:[]
|
|
|
},
|
|
|
selection:[],
|
|
|
+ isItHidden:true,
|
|
|
// 非单个禁用
|
|
|
single: true,
|
|
|
// 总条数
|
|
|
@@ -151,8 +140,8 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
span:6,
|
|
|
- label: 'fGoodsid',
|
|
|
- name:"项目名称",
|
|
|
+ label: 'fWarehouseid',
|
|
|
+ name:"仓库",
|
|
|
form:1,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
@@ -162,7 +151,7 @@ export default {
|
|
|
{
|
|
|
span:6,
|
|
|
label: 'fCorpid',
|
|
|
- name:"客户名称",
|
|
|
+ name:"供应商",
|
|
|
form:1,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
@@ -171,40 +160,60 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
span:6,
|
|
|
+ label: 'timeInterval',
|
|
|
+ name:"入库日期",
|
|
|
+ form:6,
|
|
|
+ width:250,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
+ label: 'cLoadDate',
|
|
|
+ name:"申请日期",
|
|
|
+ form:6,
|
|
|
+ width:200,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
label: 'moneys',
|
|
|
- name:"金额",
|
|
|
+ name:"金额范围",
|
|
|
form:5,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
rules: { required:false }
|
|
|
},
|
|
|
- // {
|
|
|
- // span:6,
|
|
|
- // label: 'cLoadDate',
|
|
|
- // name:"申请日期",
|
|
|
- // form:3,
|
|
|
- // width:200,
|
|
|
- // labelSize:'80',
|
|
|
- // rules:''
|
|
|
- // },
|
|
|
- // {
|
|
|
- // span:6,
|
|
|
- // label: 'createBy',
|
|
|
- // name:"申请人",
|
|
|
- // form:2,
|
|
|
- // width:200,
|
|
|
- // labelSize:'80',
|
|
|
- // rules:''
|
|
|
- // },
|
|
|
- // {
|
|
|
- // span:6,
|
|
|
- // label: 'remark',
|
|
|
- // name:"备注",
|
|
|
- // form:2,
|
|
|
- // width:200,
|
|
|
- // labelSize:'80',
|
|
|
- // rules:''
|
|
|
- // },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
+ label: 'createBy',
|
|
|
+ name:"申请人",
|
|
|
+ form:2,
|
|
|
+ width:200,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
+ label: 'fGoodsid',
|
|
|
+ name:"项目名称",
|
|
|
+ form:1,
|
|
|
+ width:200,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false },
|
|
|
+ data:[]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
+ label: 'remark',
|
|
|
+ name:"备注",
|
|
|
+ form:2,
|
|
|
+ width:200,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false }
|
|
|
+ },
|
|
|
+
|
|
|
|
|
|
],
|
|
|
//隐藏表单数据
|
|
|
@@ -213,8 +222,8 @@ export default {
|
|
|
span:6,
|
|
|
label: 'cLoadDate',
|
|
|
name:"申请日期",
|
|
|
- form:3,
|
|
|
- width:200,
|
|
|
+ form:6,
|
|
|
+ width:250,
|
|
|
labelSize:'80',
|
|
|
rules: { required:false }
|
|
|
},
|
|
|
@@ -229,6 +238,15 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
span:6,
|
|
|
+ label: 'moneys',
|
|
|
+ name:"金额范围",
|
|
|
+ form:5,
|
|
|
+ width:200,
|
|
|
+ labelSize:'80',
|
|
|
+ rules: { required:false }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span:6,
|
|
|
label: 'remark',
|
|
|
name:"备注",
|
|
|
form:2,
|
|
|
@@ -236,6 +254,7 @@ export default {
|
|
|
labelSize:'80',
|
|
|
rules: { required:false }
|
|
|
},
|
|
|
+
|
|
|
],
|
|
|
//表名称
|
|
|
tableData:[],
|
|
|
@@ -258,17 +277,18 @@ export default {
|
|
|
name: "申请编号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
- },{
|
|
|
+ }, {
|
|
|
surface: "3",
|
|
|
- label: "projectName",
|
|
|
- name: "项目名称",
|
|
|
+ label: "fWarehouseName",
|
|
|
+ name: "仓库",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
- },{
|
|
|
+ },
|
|
|
+ {
|
|
|
surface: "4",
|
|
|
label: "corpName",
|
|
|
- name: "客户名称",
|
|
|
+ name: "供应商",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
@@ -288,34 +308,50 @@ export default {
|
|
|
operation:1
|
|
|
},{
|
|
|
surface: "7",
|
|
|
+ label: "fBsdate",
|
|
|
+ name: "入库日期",
|
|
|
+ checked: 0,
|
|
|
+ width: 200,
|
|
|
+ operation:1
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "8",
|
|
|
label: "createBy",
|
|
|
name: "申请人",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
},{
|
|
|
- surface: "8",
|
|
|
+ surface: "9",
|
|
|
label: "fBillstatusName",
|
|
|
name: "状态",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
},{
|
|
|
- surface: "9",
|
|
|
+ surface: "10",
|
|
|
label: "fReviewDate",
|
|
|
name: "审核日期",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "11",
|
|
|
+ label: "projectName",
|
|
|
+ name: "项目名称",
|
|
|
+ checked: 0,
|
|
|
+ width: 200,
|
|
|
+ operation:1
|
|
|
},{
|
|
|
- surface: "10",
|
|
|
+ surface: "12",
|
|
|
label: "remark",
|
|
|
name: "备注",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
},{
|
|
|
- surface: "11",
|
|
|
+ surface: "13",
|
|
|
label: "fMaterial2",
|
|
|
name: "操作",
|
|
|
checked: 0,
|
|
|
@@ -347,7 +383,7 @@ export default {
|
|
|
label: "fUnitprice",
|
|
|
name: "单价",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable:2,
|
|
|
disabled:false,
|
|
|
@@ -357,7 +393,7 @@ export default {
|
|
|
label: "fQty",
|
|
|
name: "数量",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable:2,
|
|
|
disabled:false,
|
|
|
@@ -367,7 +403,7 @@ export default {
|
|
|
label: "fFeeunitid",
|
|
|
name: "计量单位",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
changeable:1,
|
|
|
operation:2,
|
|
|
data:[],
|
|
|
@@ -377,7 +413,7 @@ export default {
|
|
|
label: "fWarehouseid",
|
|
|
name: "库区",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable:1,
|
|
|
data:[],
|
|
|
@@ -387,7 +423,7 @@ export default {
|
|
|
label: "fAmount",
|
|
|
name: "金额",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable: 2,
|
|
|
disabled: true,
|
|
|
@@ -397,7 +433,7 @@ export default {
|
|
|
label: "fStltypeid",
|
|
|
name: "付费方式",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable: 1,
|
|
|
data:[],
|
|
|
@@ -407,7 +443,7 @@ export default {
|
|
|
label: "remark",
|
|
|
name: "备注",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable: 2,
|
|
|
disabled:false
|
|
|
@@ -416,7 +452,7 @@ export default {
|
|
|
label: "fReviewDate",
|
|
|
name: "审核日期",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable: 3,
|
|
|
disabled:true,
|
|
|
@@ -427,7 +463,7 @@ export default {
|
|
|
label: "createBy",
|
|
|
name: "申请人",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
changeable: 2,
|
|
|
disabled:true,
|
|
|
@@ -437,7 +473,7 @@ export default {
|
|
|
label: "fMaterial10",
|
|
|
name: "操作",
|
|
|
checked: 0,
|
|
|
- width: 200,
|
|
|
+ width: 100,
|
|
|
operation:2,
|
|
|
disabled:false
|
|
|
}
|
|
|
@@ -446,6 +482,7 @@ export default {
|
|
|
//详情主表
|
|
|
detailOption:[
|
|
|
{
|
|
|
+ index:'1',
|
|
|
span:6,
|
|
|
label: 'fBillno',
|
|
|
name:"系统编号",
|
|
|
@@ -457,28 +494,31 @@ export default {
|
|
|
doNot:'1'
|
|
|
},
|
|
|
{
|
|
|
+ index:'2',
|
|
|
span:6,
|
|
|
label: 'fCorpid',
|
|
|
name:"供应商",
|
|
|
form:1,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
- rules:{required: false},
|
|
|
+ rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
data:[],
|
|
|
disabled:false
|
|
|
},
|
|
|
{
|
|
|
+ index:'3',
|
|
|
span:6,
|
|
|
label: 'fStorekeeper',
|
|
|
name:"库管员",
|
|
|
form:1,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
- rules: {required: false},
|
|
|
+ rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
data:[],
|
|
|
disabled:false
|
|
|
},
|
|
|
{
|
|
|
+ index:'4',
|
|
|
span:6,
|
|
|
label: 'fWarehouseid',
|
|
|
name:"仓库",
|
|
|
@@ -488,29 +528,31 @@ export default {
|
|
|
rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
data:[],
|
|
|
disabled:false
|
|
|
- },
|
|
|
- {
|
|
|
+ }, {
|
|
|
+ index:'5',
|
|
|
span:6,
|
|
|
- label: 'fBsdate',
|
|
|
- name:"入库日期",
|
|
|
- form:3,
|
|
|
+ label: 'fSbu',
|
|
|
+ name:"付款单位",
|
|
|
+ form:1,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
+ data:[],
|
|
|
disabled:false
|
|
|
},
|
|
|
{
|
|
|
+ index:'6',
|
|
|
span:6,
|
|
|
- label: 'fSbu',
|
|
|
- name:"付款单位",
|
|
|
- form:1,
|
|
|
+ label: 'fBsdate',
|
|
|
+ name:"入库日期",
|
|
|
+ form:3,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
- rules:{required: false},
|
|
|
- data:[],
|
|
|
+ rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
disabled:false
|
|
|
},
|
|
|
{
|
|
|
+ index:'7',
|
|
|
span:6,
|
|
|
label: 'remark',
|
|
|
name:"备注",
|
|
|
@@ -714,15 +756,18 @@ export default {
|
|
|
//搜索、重置、展开
|
|
|
feedback(res){
|
|
|
if (res == '展开'){
|
|
|
+ // this.handleClick()
|
|
|
if (this.inDex == 4){
|
|
|
+ console.log("000")
|
|
|
+ console.log(this.formOption.length)
|
|
|
this.inDex = this.formOption.length
|
|
|
}else {
|
|
|
this.inDex = 4
|
|
|
}
|
|
|
}else if (res == '搜索'){
|
|
|
- this.$refs.avatar.submitForm()
|
|
|
+ this.handleQuery()
|
|
|
}else if (res == '重置'){
|
|
|
- this.$refs.avatar.form = {}
|
|
|
+ this.resetQuery()
|
|
|
}
|
|
|
},
|
|
|
selectMethods(){
|
|
|
@@ -732,19 +777,19 @@ export default {
|
|
|
//主页面下拉获取名称
|
|
|
mainMethods(){
|
|
|
for(let li in this.formOption){
|
|
|
- // if(this.formOption[li].name == '项目名称'){
|
|
|
- // let queryParams = { pageNum: 1,}
|
|
|
- // getEntry(queryParams).then(res=>{
|
|
|
- // for(let item in res.data){
|
|
|
- // this.formOption[li].data.push({
|
|
|
- // label:res.data[item].projectName,
|
|
|
- // value:res.data[item].fId
|
|
|
- // })
|
|
|
- // }
|
|
|
- // })
|
|
|
- // }
|
|
|
- // else
|
|
|
- if(this.formOption[li].name == '客户名称'){
|
|
|
+ if(this.formOption[li].name == '仓库'){
|
|
|
+ let queryParams = { pageNum: 1,}
|
|
|
+ getwarehouse(queryParams).then(res=>{
|
|
|
+ for(let item in res.rows){
|
|
|
+ this.formOption[li].data.push({
|
|
|
+ label:res.rows[item].fName,
|
|
|
+ value:res.rows[item].fId
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ else
|
|
|
+ if(this.formOption[li].name == '供应商'){
|
|
|
let queryParams = { pageNum: 1, fTypeid: 1}
|
|
|
getustomer(queryParams).then(res => {
|
|
|
for(let item in res.data){
|
|
|
@@ -852,10 +897,8 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
resetQuery(){
|
|
|
- this.queryParms = {
|
|
|
-
|
|
|
- }
|
|
|
- this.handleQuery()
|
|
|
+ this.queryParms = {}
|
|
|
+ this.getList();
|
|
|
},
|
|
|
//查询列数据
|
|
|
getRow() {
|
|
|
@@ -878,8 +921,8 @@ export default {
|
|
|
this.setRowList = this.detailStyle
|
|
|
}
|
|
|
// this.pageDisplay = false
|
|
|
- // this.isItHidden = false
|
|
|
- // this.inDex = this.contentOption.length
|
|
|
+ this.isItHidden = false
|
|
|
+ this.inDex = this.detailOption.length
|
|
|
}else {
|
|
|
if (res.data.length != 0) {
|
|
|
this.queryList.columnList = res.data.filter((e) => e.checked == 0);
|
|
|
@@ -894,8 +937,8 @@ export default {
|
|
|
this.setRowList = this.listStyle
|
|
|
}
|
|
|
// this.pageDisplay = true
|
|
|
- // this.isItHidden = true
|
|
|
- // this.inDex = 4
|
|
|
+ this.isItHidden = true
|
|
|
+ this.inDex = 4
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -915,15 +958,17 @@ export default {
|
|
|
console.log(scope)
|
|
|
this.detailList.columnList = this.detailStyle
|
|
|
getSave(scope.row.fId).then(res=>{
|
|
|
- if(res.data.warehouseBills){
|
|
|
- this.detailForm = res.data.warehouseBills
|
|
|
+ if(res.code == 200){
|
|
|
+ if(res.data.warehouseBills){
|
|
|
+ this.detailForm = res.data.warehouseBills
|
|
|
this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
- }
|
|
|
- if(res.data.tWarehousebillsfees){
|
|
|
- this.detailData = res.data.tWarehousebillsfees
|
|
|
- for(let li in this.detailData){
|
|
|
- this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
- this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ }
|
|
|
+ if(res.data.tWarehousebillsfees){
|
|
|
+ this.detailData = res.data.tWarehousebillsfees
|
|
|
+ for(let li in this.detailData){
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
for(let li in this.detailStyle){
|
|
|
@@ -936,31 +981,28 @@ export default {
|
|
|
if(this.detailForm.fBillstatus == '6'){
|
|
|
if(this.detailButton[li].name == '返回列表'){
|
|
|
this.detailButton[li].disabled = false
|
|
|
- }else if(this.detailButton[li].name == '录入' || this.detailButton[li].name == '保存'
|
|
|
- || this.detailButton[li].name == '打印' || this.detailButton[li].name == '入库确认'
|
|
|
- || this.detailButton[li].name == '刷新'){
|
|
|
+ }else {
|
|
|
+ this.detailButton[li].disabled = true
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if(this.detailButton[li].name == '返回列表' || this.detailButton[li].name == '修改'){
|
|
|
+ this.detailButton[li].disabled = false
|
|
|
+ }else{
|
|
|
this.detailButton[li].disabled = true
|
|
|
}
|
|
|
- }else if(this.detailButton[li].name == '录入' || this.detailButton[li].name == '保存'
|
|
|
- || this.detailButton[li].name == '打印' || this.detailButton[li].name == '入库确认'
|
|
|
- || this.detailButton[li].name == '刷新'){
|
|
|
- this.detailButton[li].disabled = true
|
|
|
}
|
|
|
}
|
|
|
getArea(this.detailForm.fWarehouseid).then(res=>{
|
|
|
- this.listData.fWarehouseid = []
|
|
|
- for(let item in res.data){
|
|
|
- this.listData.fWarehouseid.push({
|
|
|
- label:res.data[item].fWarehouseInformation,
|
|
|
- value:res.data[item].id
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
- for(let li in this.detailStyle){
|
|
|
- if(this.detailStyle[li].name == '库区'){
|
|
|
-
|
|
|
+ if(res.code == 200){
|
|
|
+ this.listData.fWarehouseid = []
|
|
|
+ for(let item in res.data){
|
|
|
+ this.listData.fWarehouseid.push({
|
|
|
+ label:res.data[item].fWarehouseInformation,
|
|
|
+ value:res.data[item].id
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
+ })
|
|
|
this.MainTable = true
|
|
|
})
|
|
|
},
|
|
|
@@ -1022,19 +1064,21 @@ export default {
|
|
|
})
|
|
|
.then(()=>{
|
|
|
getSave(this.detailForm.fId).then(res=>{
|
|
|
- if(res.data.warehouseBills){
|
|
|
- this.detailForm = res.data.warehouseBills
|
|
|
- this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
- }
|
|
|
- if(res.data.tWarehousebillsfees){
|
|
|
- this.detailData = res.data.tWarehousebillsfees
|
|
|
- for(let li in this.detailData){
|
|
|
- this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
- this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ if(res.code == 200){
|
|
|
+ if(res.data.warehouseBills){
|
|
|
+ this.detailForm = res.data.warehouseBills
|
|
|
+ this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
+ }
|
|
|
+ if(res.data.tWarehousebillsfees){
|
|
|
+ this.detailData = res.data.tWarehousebillsfees
|
|
|
+ for(let li in this.detailData){
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ }
|
|
|
}
|
|
|
+ this.msgSuccess("删除成功");
|
|
|
}
|
|
|
})
|
|
|
- this.msgSuccess("删除成功");
|
|
|
})
|
|
|
.catch(res=>{
|
|
|
this.$message.error(res)
|
|
|
@@ -1045,7 +1089,6 @@ export default {
|
|
|
},
|
|
|
//必填项
|
|
|
verificationRules(valid){
|
|
|
- console.log(valid)
|
|
|
if(valid){
|
|
|
this.detailData.push({
|
|
|
serialNumber:null,
|
|
|
@@ -1069,6 +1112,7 @@ export default {
|
|
|
if(this.detailOption[li].disabled == true){
|
|
|
this.show = false
|
|
|
// row.icon = 'el-icon-arrow-up'
|
|
|
+ this.getList();
|
|
|
this.MainTable = false
|
|
|
} else {
|
|
|
this.$confirm("返回列表，是否保存?", "提示", {
|
|
|
@@ -1076,7 +1120,8 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
|
|
}).then(() => {
|
|
|
- this.$refs.detailForm.saveRules()
|
|
|
+ this.$refs.detailForm.saveRules('1')
|
|
|
+ // this.MainTable = false
|
|
|
}).catch(() => {
|
|
|
this.show = false
|
|
|
// row.icon = 'el-icon-arrow-up'
|
|
|
@@ -1087,7 +1132,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- backSave(valid){
|
|
|
+ backSave(valid,i){
|
|
|
if(valid){
|
|
|
this.detailForm.fMoney = 0
|
|
|
for(let li in this.detailData){
|
|
|
@@ -1100,22 +1145,31 @@ export default {
|
|
|
formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
|
|
|
formData.append('fBilltype', 'RK')
|
|
|
addSave(formData).then(res=>{
|
|
|
- this.$message.success("操作成功")
|
|
|
- this.MainTable = false
|
|
|
- this.getList();
|
|
|
- this.show = false
|
|
|
- row.icon = 'el-icon-arrow-up'
|
|
|
+ if(res.code == 200){
|
|
|
+ this.detailForm = res.data.warehouseBills
|
|
|
+ this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
+ this.detailData = res.data.tWarehousebillsCntrs
|
|
|
+ for(let li in this.detailData){
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ }
|
|
|
+ this.$message.success("操作成功")
|
|
|
+ this.getList();
|
|
|
+ if(i == 1){
|
|
|
+ this.MainTable = false
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
//所以按钮
|
|
|
buttonList(row){
|
|
|
console.log(row)
|
|
|
- console.log(this.detailStyle)
|
|
|
if(row.name == '新增'){
|
|
|
this.detailList.columnList = this.detailStyle
|
|
|
this.detailForm = {}
|
|
|
this.detailData = []
|
|
|
+ this.inDex = this.detailOption.length
|
|
|
//从表修改按钮
|
|
|
for(let li in this.detailStyle){
|
|
|
if(!this.detailStyle[li].doNot){
|
|
|
@@ -1135,37 +1189,20 @@ export default {
|
|
|
this.$refs.detailForm.rules()
|
|
|
}else if(row.name == '返回列表'){
|
|
|
this.backRules()
|
|
|
- }else if(row.name == '展开'){
|
|
|
- this.show = !this.show
|
|
|
- if(this.show){
|
|
|
- row.icon = 'el-icon-arrow-down'
|
|
|
- }else{
|
|
|
- row.icon = 'el-icon-arrow-up'
|
|
|
- }
|
|
|
- this.getList()
|
|
|
}else if(row.name == '保存'){
|
|
|
- this.detailForm.fMoney = 0
|
|
|
- for(let li in this.detailData){
|
|
|
- if(this.detailData[li]){
|
|
|
- this.detailForm.fMoney += Number(this.detailData[li].fAmount)
|
|
|
+ this.$refs.detailForm.saveRules()
|
|
|
+ }else if(row.name == '入库确认'){
|
|
|
+ for(let item in this.detailData) {
|
|
|
+ let num = Number(item) + 1
|
|
|
+ if(!this.detailData[item].fQty){
|
|
|
+ this.$message.error("请维护第" + num + "数量")
|
|
|
+ return false
|
|
|
}
|
|
|
- }
|
|
|
- let formData = new window.FormData();
|
|
|
- formData.append('tWarehousebills', JSON.stringify(this.detailForm))
|
|
|
- formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
|
|
|
- formData.append('fBilltype', 'RK')
|
|
|
- addSave(formData).then(res=>{
|
|
|
- console.log(res)
|
|
|
- this.detailForm = res.data.warehouseBills
|
|
|
- this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
- this.detailData = res.data.tWarehousebillsCntrs
|
|
|
- for(let li in this.detailData){
|
|
|
- this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
- this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ if (!this.detailData[item].fWarehouseid) {
|
|
|
+ this.$message.error("请维护第" + num + "行库区")
|
|
|
+ return false
|
|
|
}
|
|
|
- this.$message.success("操作成功")
|
|
|
- })
|
|
|
- }else if(row.name == '入库确认'){
|
|
|
+ }
|
|
|
this.detailForm.fMoney = 0
|
|
|
for(let li in this.detailData){
|
|
|
if(this.detailData[li]){
|
|
|
@@ -1198,23 +1235,27 @@ export default {
|
|
|
for(let li in this.detailButton) {
|
|
|
if (this.detailButton[li].name == '返回列表') {
|
|
|
this.detailButton[li].disabled = false
|
|
|
+ }else{
|
|
|
+ this.detailButton[li].disabled = true
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
}else if(row.name == '刷新'){
|
|
|
- getSave(this.detailForm.fId).then(res=>{
|
|
|
- if(res.data.warehouseBills){
|
|
|
- this.detailForm = res.data.warehouseBills
|
|
|
- this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
- }
|
|
|
- if(res.data.tWarehousebillsfees){
|
|
|
- this.detailData = res.data.tWarehousebillsfees
|
|
|
- for(let li in this.detailData){
|
|
|
- this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
- this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ if(this.detailForm.fId){
|
|
|
+ getSave(this.detailForm.fId).then(res=>{
|
|
|
+ if(res.data.warehouseBills){
|
|
|
+ this.detailForm = res.data.warehouseBills
|
|
|
+ this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
}
|
|
|
- }
|
|
|
- })
|
|
|
+ if(res.data.tWarehousebillsfees){
|
|
|
+ this.detailData = res.data.tWarehousebillsfees
|
|
|
+ for(let li in this.detailData){
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
}else if(row.name == '复制新增'){
|
|
|
console.log(this.selection[0].fId)
|
|
|
let formData = {
|
|
|
@@ -1247,6 +1288,7 @@ export default {
|
|
|
// 显示搜索条件、点击后会调用此方法
|
|
|
showSearch(){
|
|
|
console.log('到我了')
|
|
|
+ this.getList()
|
|
|
},
|
|
|
//点击刷新会调用此方法
|
|
|
getList(){
|
|
|
@@ -1260,6 +1302,8 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
-<style scoped>
|
|
|
-
|
|
|
+<style scoped lang="scss">
|
|
|
+.app-container ::v-deep .el-form-item {
|
|
|
+ margin-bottom: 4px;
|
|
|
+}
|
|
|
</style>
|
caojunjie