|
|
@@ -247,7 +247,6 @@
|
|
|
/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
<el-table-column
|
|
|
- :show-overflow-tooltip="true"
|
|
|
label="唛头"
|
|
|
align="center"
|
|
|
prop="fMarks"
|
|
|
@@ -274,13 +273,14 @@
|
|
|
<!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
<el-table-column label="出库毛重" align="center" prop="fGrossweight" />
|
|
|
<el-table-column label="净重" align="center" prop="fNetweight" />
|
|
|
- <el-table-column width="100" label="状态" align="center" prop="fItemsStatus" />
|
|
|
+ <el-table-column width="150" label="费用状态" align="center" prop="fBillstatus" />
|
|
|
+ <el-table-column width="150" label="入库状态" align="center" prop="fItemsStatus" />
|
|
|
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
class-name="small-padding fixed-width"
|
|
|
- width="100"
|
|
|
+ width="180"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -567,24 +567,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
- <!--点击展开-->
|
|
|
- <el-button
|
|
|
- @click="
|
|
|
- detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
|
|
|
- "
|
|
|
- >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
|
|
|
- >
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button type="success" prop="打印" @click="showEditDialog_ss"
|
|
|
- >收货单
|
|
|
- </el-button>
|
|
|
- <el-button type="warning" prop="打印" @click="showEditDialog_s"
|
|
|
- >出库单
|
|
|
- </el-button>
|
|
|
- <el-button type="info" prop="打印" @click="showEditDialog_sss"
|
|
|
- >作业单
|
|
|
- </el-button>
|
|
|
- <el-button type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
+
|
|
|
<div v-if="detailsHidden">
|
|
|
<el-row style="margin-top: 30px">
|
|
|
<el-col :span="8">
|
|
|
@@ -754,6 +737,24 @@
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
<el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <!--点击展开-->
|
|
|
+ <el-button style="margin-left:19%;"
|
|
|
+ @click="
|
|
|
+ detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
|
|
|
+ "
|
|
|
+ >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
|
|
|
+ >
|
|
|
+ <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="success" prop="打印" @click="showEditDialog_ss"
|
|
|
+ >收货单
|
|
|
+ </el-button>
|
|
|
+ <el-button type="warning" prop="打印" @click="showEditDialog_s"
|
|
|
+ >出库单
|
|
|
+ </el-button>
|
|
|
+ <el-button type="info" prop="打印" @click="showEditDialog_sss"
|
|
|
+ >作业单
|
|
|
+ </el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
@@ -846,7 +847,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fCntrtype"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
placeholder="箱型"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -864,7 +865,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fCntqty"
|
|
|
placeholder="箱量"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -886,7 +887,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fGrossweight"
|
|
|
placeholder="出库毛重"
|
|
|
@@ -905,7 +906,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fNetweight"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
placeholder="出库净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -923,7 +924,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
@change="qtyChange(scope.row)"
|
|
|
v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
placeholder="出库件数"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -940,7 +941,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fVolumn"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
placeholder="出库尺码"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -957,7 +958,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fPackagespecs"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
placeholder="包装规格"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -975,7 +976,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fCntrno"
|
|
|
placeholder="箱号"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -992,7 +993,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fGoodsval"
|
|
|
placeholder="货值"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1009,7 +1010,7 @@
|
|
|
oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
v-model="scope.row.fTruckno"
|
|
|
placeholder="车号"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1025,7 +1026,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.remark"
|
|
|
placeholder="备注"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1041,7 +1042,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fBillstatus"
|
|
|
placeholder="状态"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === '6'"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1082,6 +1083,7 @@
|
|
|
prop="fName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
+ width="250px"
|
|
|
label="附件名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1097,6 +1099,7 @@
|
|
|
prop="createBy"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
+ width="250px"
|
|
|
label="上传人"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1129,7 +1132,7 @@
|
|
|
prop="fUrl"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="80%"
|
|
|
+ width="300px"
|
|
|
label="上传附件"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1140,7 +1143,6 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
- width="130PX"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -2262,6 +2264,9 @@ export default {
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
+ fMarks: [
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
+ ],
|
|
|
fBsdate: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fSbu: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
@@ -2470,12 +2475,24 @@ export default {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
for (let li in this.warehousebillsList) {
|
|
|
if(this.warehousebillsList[li].fItemsStatus === '6') {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "已入账"
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "全部入账"
|
|
|
// this.browseStatus = true;
|
|
|
} else if(this.warehousebillsList[li].fItemsStatus === '1') {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "未入账"
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "录入"
|
|
|
} else {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "未完成所有入账"
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "部分入账"
|
|
|
+ }
|
|
|
+ if (this.warehousebillsList[li].fBillstatus === '6') {
|
|
|
+ this.warehousebillsList[li].fBillstatus = "审核通过"
|
|
|
+ } else if(this.warehousebillsList[li].fBillstatus === '3') {
|
|
|
+ this.warehousebillsList[li].fBillstatus = "驳回"
|
|
|
+ }else if(this.warehousebillsList[li].fBillstatus === '4') {
|
|
|
+ this.warehousebillsList[li].fBillstatus = "请核"
|
|
|
+ }
|
|
|
+ else if(this.warehousebillsList[li].fBillstatus === '2') {
|
|
|
+ this.warehousebillsList[li].fBillstatus = "录入"
|
|
|
+ }else if(this.warehousebillsList[li].fBillstatus === '5') {
|
|
|
+ this.warehousebillsList[li].fBillstatus = "驳回"
|
|
|
}
|
|
|
}
|
|
|
console.log(response.rows);
|
|
|
@@ -2921,7 +2938,7 @@ export default {
|
|
|
fNetweight &&
|
|
|
fQty
|
|
|
) {
|
|
|
- this.$set(this.dataList[i], "fBillstatus", "7");
|
|
|
+ this.$set(this.dataList[i], "fBillstatus", "6");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3034,10 +3051,10 @@ export default {
|
|
|
this.$message.error("请新增库存明细!");
|
|
|
return false;
|
|
|
}
|
|
|
- if (this.relevantAttachments.length === 0) {
|
|
|
- this.$message.error("请新增附件上传!");
|
|
|
- return false;
|
|
|
- }
|
|
|
+ // if (this.relevantAttachments.length === 0) {
|
|
|
+ // this.$message.error("请新增附件上传!");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
if (this.warehouseDrList.length === 0) {
|
|
|
this.$message.error("请新增收款信息!");
|
|
|
return false;
|
|
|
@@ -3067,12 +3084,12 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- for (let list in this.relevantAttachments) {
|
|
|
- if (this.relevantAttachments[list].fName === null) {
|
|
|
- this.$message.error("请输入附件名称!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
+ // for (let list in this.relevantAttachments) {
|
|
|
+ // if (this.relevantAttachments[list].fName === null) {
|
|
|
+ // this.$message.error("请输入附件名称!");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
for (let list in this.warehouseDrList) {
|
|
|
if (!this.warehouseDrList[list].fCorpid) {
|
|
|
this.$message.error("请选择客户名称");
|
tong