|
@@ -43,6 +43,7 @@
|
|
|
:customButton="customButton"
|
|
|
:arrow="arrow"
|
|
|
:seachButton="seachButton"
|
|
|
+ :setRowList="listStyle"
|
|
|
:listStyle="listStyle"
|
|
|
:queryList="queryList"/>
|
|
|
<pagination
|
|
@@ -80,7 +81,7 @@
|
|
|
@totalAmount="totalAmount"
|
|
|
:seachButton="confirmButton"
|
|
|
:customButton="detailButton"
|
|
|
- :listStyle="mainStyle"
|
|
|
+ :listStyle="detailStyle"
|
|
|
:setRowList="detailStyle"
|
|
|
:tatolLabel="tatolLabel"
|
|
|
:listData="listData"
|
|
@@ -95,7 +96,7 @@ import MainForm from '@/combination/MainForm'
|
|
|
import { listInStock, addSave, getSave, getArea,
|
|
|
getustomer,getEntry, getwarehouse, getGoodName,
|
|
|
canBedelet, delRows, getWarehousekeeper, addWarehous,
|
|
|
- deletMain, delFee, copyNew} from '@/api/warehouse/inStock'
|
|
|
+ deletMain, delFee, copyNew, listQuery} from '@/api/warehouse/inStock'
|
|
|
import Cookies from 'js-cookie'
|
|
|
export default {
|
|
|
name: 'inStock',
|
|
@@ -301,7 +302,7 @@ export default {
|
|
|
operation:1
|
|
|
},{
|
|
|
surface: "9",
|
|
|
- label: "fMaterial2",
|
|
|
+ label: "fReviewDate",
|
|
|
name: "审核日期",
|
|
|
checked: 0,
|
|
|
width: 200,
|
|
@@ -495,7 +496,7 @@ export default {
|
|
|
form:3,
|
|
|
width:200,
|
|
|
labelSize:'80',
|
|
|
- rules:'',
|
|
|
+ rules:{ required: true, message: ' ', trigger: 'blur' },
|
|
|
disabled:false
|
|
|
},
|
|
|
{
|
|
@@ -663,11 +664,28 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
+ console.log(Cookies.get("userName"))
|
|
|
+ console.log(this.queryList.tableName)
|
|
|
+ let data = {
|
|
|
+ tableName: this.queryList.tableName,
|
|
|
+ userId: Cookies.get("userName"),
|
|
|
+ };
|
|
|
+ this.getRow(data)
|
|
|
+ let list = {
|
|
|
+ fBilltype:'RK'
|
|
|
+ }
|
|
|
+ this.query(list)
|
|
|
this.getRow()
|
|
|
this.getList()
|
|
|
this.selectMethods()
|
|
|
},
|
|
|
methods:{
|
|
|
+ //查询主页列数据
|
|
|
+ query(data){
|
|
|
+ listQuery(data).then(res =>{
|
|
|
+ this.tableData = res.rows
|
|
|
+ })
|
|
|
+ },
|
|
|
//更换仓库
|
|
|
changeWarehouse(){
|
|
|
if(this.detailData.length != 0){
|
|
@@ -714,17 +732,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,}
|
|
|
+ // 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 == '客户名称'){
|
|
|
let queryParams = { pageNum: 1, fTypeid: 1}
|
|
|
getustomer(queryParams).then(res => {
|
|
|
for(let item in res.data){
|
|
@@ -839,29 +859,43 @@ export default {
|
|
|
},
|
|
|
//查询列数据
|
|
|
getRow() {
|
|
|
- this.data = {
|
|
|
+ let data = {
|
|
|
tableName: this.queryList.tableName,
|
|
|
userId: Cookies.get("userName"),
|
|
|
};
|
|
|
- select(this.data).then((res) => {
|
|
|
- if (res.data.length != 0) {
|
|
|
- this.queryList.columnList = res.data.filter((e) => e.checked == 0);
|
|
|
- this.queryList.columnList = res.data;
|
|
|
- this.queryList.columnList = this.queryList.columnList.reduce((res, item) => {
|
|
|
- res.push({
|
|
|
- surface: item.surface,
|
|
|
- label: item.label,
|
|
|
- name: item.name,
|
|
|
- checked: item.checked,
|
|
|
- width: item.width,
|
|
|
- fixed: item.fixed,
|
|
|
- });
|
|
|
- return res;
|
|
|
- }, []);
|
|
|
- this.waitFor = true
|
|
|
+ console.log(data)
|
|
|
+ select(data).then((res) => {
|
|
|
+ if (data.tableName === '仓库入库详情') {
|
|
|
+ if (res.data.length != 0) {
|
|
|
+ this.detailList.columnList = res.data.filter((e) => e.checked == 0);
|
|
|
+ this.detailList.columnList = res.data;
|
|
|
+ this.setRowList = res.data
|
|
|
+ this.detailList.columnList = this.detailList.columnList.filter((e) => e.checked == 0);
|
|
|
+ // this.waitFor = true
|
|
|
+ }else {
|
|
|
+ // this.waitFor = true
|
|
|
+ this.detailList.columnList = this.detailStyle
|
|
|
+ this.setRowList = this.detailStyle
|
|
|
+ }
|
|
|
+ // this.pageDisplay = false
|
|
|
+ // this.isItHidden = false
|
|
|
+ // this.inDex = this.contentOption.length
|
|
|
}else {
|
|
|
- this.waitFor = true
|
|
|
- this.queryList.columnList = this.listStyle
|
|
|
+ if (res.data.length != 0) {
|
|
|
+ this.queryList.columnList = res.data.filter((e) => e.checked == 0);
|
|
|
+ this.queryList.columnList = res.data;
|
|
|
+ this.setRowList = res.data
|
|
|
+ this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0);
|
|
|
+ this.waitFor = true
|
|
|
+ }else {
|
|
|
+ this.waitFor = true
|
|
|
+ this.queryList.columnList = this.listStyle
|
|
|
+ console.log(this.queryList.columnList.fFeeid)
|
|
|
+ this.setRowList = this.listStyle
|
|
|
+ }
|
|
|
+ // this.pageDisplay = true
|
|
|
+ // this.isItHidden = true
|
|
|
+ // this.inDex = 4
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -1121,6 +1155,14 @@ export default {
|
|
|
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))
|
|
|
+ }
|
|
|
this.$message.success("操作成功")
|
|
|
})
|
|
|
}else if(row.name == '入库确认'){
|