|
|
@@ -249,7 +249,7 @@ export default {
|
|
|
{
|
|
|
span:6,
|
|
|
label: 'cLoadDate',
|
|
|
- name:"申请日期",
|
|
|
+ name:"制单日期",
|
|
|
form:6,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
@@ -311,7 +311,7 @@ export default {
|
|
|
},{
|
|
|
surface: "2",
|
|
|
label: "fBillno",
|
|
|
- name: "申请编号",
|
|
|
+ name: "系统编号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
}, {
|
|
|
@@ -339,7 +339,7 @@ export default {
|
|
|
},{
|
|
|
surface: "6",
|
|
|
label: "createTime",
|
|
|
- name: "申请日期",
|
|
|
+ name: "制单日期",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
operation:1
|
|
|
@@ -410,7 +410,7 @@ export default {
|
|
|
},{
|
|
|
surface: "2",
|
|
|
label: "fFeeid",
|
|
|
- name: "品名",
|
|
|
+ name: "*品名",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
|
changeable:1,
|
|
|
@@ -420,7 +420,7 @@ export default {
|
|
|
{
|
|
|
surface: "3",
|
|
|
label: "fCurrencyName",
|
|
|
- name: "规格",
|
|
|
+ name: "*规格",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
disabled:false
|
|
|
@@ -428,7 +428,7 @@ export default {
|
|
|
{
|
|
|
surface: "4",
|
|
|
label: "fUnitprice",
|
|
|
- name: "单价",
|
|
|
+ name: "*单价",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
operation:2,
|
|
|
@@ -438,7 +438,7 @@ export default {
|
|
|
},{
|
|
|
surface: "5",
|
|
|
label: "fQty",
|
|
|
- name: "数量",
|
|
|
+ name: "*数量",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
operation:2,
|
|
|
@@ -448,7 +448,7 @@ export default {
|
|
|
},{
|
|
|
surface: "6",
|
|
|
label: "fFeeunitid",
|
|
|
- name: "计量单位",
|
|
|
+ name: "*计量单位",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
changeable:1,
|
|
|
@@ -458,7 +458,7 @@ export default {
|
|
|
},{
|
|
|
surface: "7",
|
|
|
label: "fWarehouseid",
|
|
|
- name: "库区",
|
|
|
+ name: "*库区",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
operation:2,
|
|
|
@@ -468,7 +468,7 @@ export default {
|
|
|
},{
|
|
|
surface: "8",
|
|
|
label: "fAmount",
|
|
|
- name: "金额",
|
|
|
+ name: "*金额",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
operation:2,
|
|
|
@@ -818,14 +818,19 @@ export default {
|
|
|
},
|
|
|
activated(){
|
|
|
if (this.$route.query.open === 'true'){
|
|
|
- this.detailList.columnList = this.detailStyle
|
|
|
+ // this.detailList.columnList = this.detailStyle
|
|
|
this.detailForm = {}
|
|
|
this.detailData = []
|
|
|
- this.inDex = this.detailOption.length
|
|
|
+ // this.inDex = this.detailOption.length
|
|
|
//从表修改按钮
|
|
|
- for(let li in this.detailStyle){
|
|
|
- if(!this.detailStyle[li].doNot){
|
|
|
- this.detailStyle[li].disabled = false
|
|
|
+ let data = {
|
|
|
+ tableName: this.detailList.tableName,
|
|
|
+ userId: Cookies.get('userName')
|
|
|
+ }
|
|
|
+ this.getRow(data,null,1)
|
|
|
+ for(let li in this.detailList.columnList){
|
|
|
+ if(!this.detailList.columnList[li].doNot){
|
|
|
+ this.detailList.columnList[li].disabled = false
|
|
|
}
|
|
|
}
|
|
|
for(let item in this.detailOption){
|
|
|
@@ -1096,6 +1101,7 @@ export default {
|
|
|
this.setRowList = res.data
|
|
|
this.detailList.columnList = this.detailList.columnList.filter((e) => e.checked == 0);
|
|
|
// this.waitFor = true
|
|
|
+ console.log("000")
|
|
|
}else {
|
|
|
// this.waitFor = true
|
|
|
this.$set(this.detailList,'columnList',this.$options.data().detailStyle)
|
|
|
@@ -1104,7 +1110,14 @@ export default {
|
|
|
this.isItHidden = false
|
|
|
this.inDex = this.detailOption.length
|
|
|
if (iem === undefined){
|
|
|
+ console.log("111")
|
|
|
this.detailList.columnList.forEach(item => item.disabled = true)
|
|
|
+ }else if(iem == 1){
|
|
|
+ for(let li in this.detailList.columnList){
|
|
|
+ if(!this.detailList.columnList[li].doNot){
|
|
|
+ this.detailList.columnList[li].disabled = false
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}else {
|
|
|
if (res.data.length != 0) {
|
|
|
@@ -1122,6 +1135,7 @@ export default {
|
|
|
this.inDex = 4
|
|
|
}
|
|
|
if(list){
|
|
|
+ console.log("333")
|
|
|
this.detailForm = list.warehouseBills
|
|
|
this.detailData = list.tWarehousebillsfees
|
|
|
this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
@@ -1201,17 +1215,19 @@ export default {
|
|
|
}
|
|
|
this.getRow(data,list,iem)
|
|
|
}
|
|
|
- getArea(this.detailForm.fWarehouseid).then(res=>{
|
|
|
- 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
|
|
|
- })
|
|
|
+ if(res.data.warehouseBills){
|
|
|
+ getArea(res.data.warehouseBills.fWarehouseid).then(res=>{
|
|
|
+ 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
|
|
|
this.inDex = this.detailOption.length
|
|
|
})
|
|
|
@@ -1326,6 +1342,7 @@ export default {
|
|
|
if(this.detailOption[li].disabled == true){
|
|
|
this.inDex = 4
|
|
|
this.getList();
|
|
|
+ this.isItHidden = true
|
|
|
this.MainTable = false
|
|
|
} else {
|
|
|
this.$confirm("返回列表，是否保存?", "提示", {
|
|
|
@@ -1336,6 +1353,7 @@ export default {
|
|
|
this.$refs.detailForm.saveRules('1')
|
|
|
}).catch(() => {
|
|
|
this.inDex = 4
|
|
|
+ this.isItHidden = true
|
|
|
this.MainTable = false
|
|
|
this.getList();
|
|
|
});
|
|
|
@@ -1399,6 +1417,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
if(i == 1){
|
|
|
+ this.isItHidden = true
|
|
|
this.MainTable = false
|
|
|
this.inDex = 4
|
|
|
}
|
|
|
@@ -1470,14 +1489,34 @@ export default {
|
|
|
}else{
|
|
|
for(let item in this.detailData) {
|
|
|
let num = Number(item) + 1
|
|
|
+ if (!this.detailData[item].fFeeid) {
|
|
|
+ this.$message.error("请维护第" + num + "行品名")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!this.detailData[item].fCurrencyName) {
|
|
|
+ this.$message.error("请维护第" + num + "行规格")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!this.detailData[item].fUnitprice) {
|
|
|
+ this.$message.error("请维护第" + num + "行单价")
|
|
|
+ return false
|
|
|
+ }
|
|
|
if(!this.detailData[item].fQty){
|
|
|
this.$message.error("请维护第" + num + "数量")
|
|
|
return false
|
|
|
}
|
|
|
+ if (!this.detailData[item].fFeeunitid) {
|
|
|
+ this.$message.error("请维护第" + num + "行计量单位")
|
|
|
+ return false
|
|
|
+ }
|
|
|
if (!this.detailData[item].fWarehouseid) {
|
|
|
this.$message.error("请维护第" + num + "行库区")
|
|
|
return false
|
|
|
}
|
|
|
+ if (!this.detailData[item].fAmount) {
|
|
|
+ this.$message.error("请维护第" + num + "行金额")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
this.detailForm.fMoney = 0
|
|
|
for(let li in this.detailData){
|
wengyuwen