|
|
@@ -34,14 +34,14 @@
|
|
|
<span v-else>出库量: 0 吨</span>
|
|
|
<span v-if="orderList.unitContractPrice">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
|
|
|
<span v-else>合同单价: 0 元/吨</span>
|
|
|
- <span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
|
|
|
+ <span v-if="amountReceivable">应收: {{ amountReceivable.toFixed(2) }} 元</span>
|
|
|
<span v-else>应收: 0 元</span>
|
|
|
- <span v-if="amountReceived">已收: {{ amountReceived }} 元
|
|
|
+ <span v-if="amountReceived">已收: {{ amountReceived.toFixed(2) }} 元
|
|
|
<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
src="../../../public/img/fujian.png" @click="fujian1()" alt="" />
|
|
|
</span>
|
|
|
<span v-else>已收: 0 元</span>
|
|
|
- <span v-if="uncollectedAmount">未收: {{ uncollectedAmount }} 元</span>
|
|
|
+ <span v-if="uncollectedAmount">未收: {{ uncollectedAmount.toFixed(2) }} 元</span>
|
|
|
<span v-else>未收: 0 元</span>
|
|
|
<span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元
|
|
|
<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
@@ -65,9 +65,9 @@
|
|
|
<el-table-column class="table_td" prop="tare" label="皮重(吨)"></el-table-column>
|
|
|
<el-table-column class="table_td" prop="netWeight" label="净重(吨)">
|
|
|
<template slot-scope="scope">
|
|
|
- <span style="color: #ce4545;"
|
|
|
- v-if="scope.row.returnFlag == 1">-{{scope.row.netWeight}}(退)</span>
|
|
|
- <span v-if="scope.row.returnFlag == null">{{scope.row.netWeight }}</span>
|
|
|
+ <span style="color: #ce4545;" @click='fujian2(scope.row)'
|
|
|
+ v-if="scope.row.returnFlag == 1">{{scope.row.netWeight}}(退)</span>
|
|
|
+ <span @click='fujian2(scope.row)' v-if="scope.row.returnFlag == null">{{scope.row.netWeight }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)">
|
|
|
@@ -81,7 +81,7 @@
|
|
|
<span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
+ <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
src="../../../public/img/edit.png" @click="whether(scope.row)"
|
|
|
v-if="scope.row.identification == 'false'" alt="" />
|
|
|
<i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
|
|
|
@@ -118,6 +118,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</WinseaContentModal>
|
|
|
+ <WinseaContentModal v-model="accessoryTFs2" :title="$t('system.noticeCircular.information')"
|
|
|
+ @on-cancel="handleClose">
|
|
|
+ <img width="100" height="100" :src="appendixIdss2" alt="">
|
|
|
+ </WinseaContentModal>
|
|
|
<!-- 收款 -->
|
|
|
<el-dialog width="25%" title="收款" :visible.sync="dialogFormVisible1" :append-to-body="true">
|
|
|
<el-form :model="form">
|
|
|
@@ -132,7 +136,7 @@
|
|
|
class="deal" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="上传收款截图" :label-width="formLabelWidth">
|
|
|
- <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
|
|
|
+ <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
|
|
|
:on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
|
|
|
<i class="el-icon-plus"></i>
|
|
|
</el-upload>
|
|
|
@@ -140,17 +144,17 @@
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialogFormVisible1 = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="collectment()">提 交</el-button>
|
|
|
+ <el-button v-hasPermission="`report.goodsSaleOutReport.payment`" type="primary" @click="collectment()">提 交</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 定金 -->
|
|
|
<el-dialog width="25%" title="定金" :visible.sync="dialogFormVisible2" :append-to-body="true">
|
|
|
<el-form :model="form">
|
|
|
<el-form-item label="已收定金(元)" :label-width="formLabelWidth">
|
|
|
- <el-input v-model="deposit" autocomplete="off" placeholder="输入定金金额" class="deal"></el-input>
|
|
|
+ <el-input v-model="orderList.deposit" autocomplete="off" placeholder="输入定金金额" class="deal"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="上传定金截图" :label-width="formLabelWidth">
|
|
|
- <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
|
|
|
+ <el-upload action="https://www.zthymaoyi.com/upload/admin" :limit='1' list-type="picture-card"
|
|
|
:on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
|
|
|
<i class="el-icon-plus"></i>
|
|
|
</el-upload>
|
|
|
@@ -165,12 +169,12 @@
|
|
|
<el-dialog width="25%" title="备注" :visible.sync="collectForm1" :append-to-body="true">
|
|
|
<el-form :model="form">
|
|
|
<div class="beizhu">
|
|
|
- <el-input v-model="remark" autocomplete="off" placeholder="备注信息,不超过1000字" class="deal"></el-input>
|
|
|
+ <el-input v-model="orderList.remark" autocomplete="off" placeholder="备注信息,不超过1000字" class="deal"></el-input>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="collectForm1 = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="adoptRemarks()">保存</el-button>
|
|
|
+ <el-button @click="collectForm1 = false">关闭</el-button>
|
|
|
+ <el-button v-hasPermission="`report.goodsSaleOutReport.carry`" type="primary" @click="adoptRemarks()">保存</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -272,11 +276,21 @@
|
|
|
appendixIdss: [],
|
|
|
accessoryTFs1: false,
|
|
|
appendixIdss1: [],
|
|
|
+ appendixIdss2:'',
|
|
|
+ accessoryTFs2: false,
|
|
|
addressUrlArray: [],
|
|
|
addressUrlArray1: [],
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
+ var now = new Date();
|
|
|
+ var year = now.getFullYear(); //得到年份
|
|
|
+ var month = now.getMonth(); //得到月份
|
|
|
+ var date = now.getDate(); //得到日期
|
|
|
+ month = month + 1;
|
|
|
+ month = month.toString().padStart(2, "0");
|
|
|
+ date = date.toString().padStart(2, "0");
|
|
|
+ this.collectionDate = `${year}-${month}-${date}`;
|
|
|
this.getList()
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
@@ -366,7 +380,7 @@
|
|
|
this.collectForm1 = true
|
|
|
},
|
|
|
adoptRemarks() {
|
|
|
- this.remarkInformation.remark = this.remark
|
|
|
+ this.remarkInformation.remark = this.orderList.remark
|
|
|
this.$confirm(`确定要保存备注信息？`, {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
@@ -446,7 +460,7 @@
|
|
|
this.dialogFormVisible2 = true
|
|
|
},
|
|
|
depositSubmit() {
|
|
|
- this.remarkInformation.deposit = this.deposit
|
|
|
+ this.remarkInformation.deposit = this.orderList.deposit
|
|
|
this.remarkInformation.depositUrl = this.depositUrl
|
|
|
this.$confirm(`确定提交定金信息？`, {
|
|
|
cancelButtonText: '取消',
|
|
|
@@ -458,8 +472,8 @@
|
|
|
this.remarkInformationList.id = this.contractNoList[i].id
|
|
|
}
|
|
|
}
|
|
|
- this.remarkInformationList.deposit = this.deposit
|
|
|
- this.remarkInformationList.depositUrl = this.depositUrl
|
|
|
+ this.remarkInformationList.deposit = this.orderList.deposit
|
|
|
+ this.remarkInformationList.depositUrl = this.depositUrl.toString()
|
|
|
disOrRemarks(this.remarkInformationList)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -488,6 +502,16 @@
|
|
|
this.appendixIdss = this.orderList.depositUrl
|
|
|
this.accessoryTFs = true
|
|
|
},
|
|
|
+ fujian2(item) {
|
|
|
+ if (item.poundImg === null || item.poundImg === '') {
|
|
|
+ EventBus.$emit(
|
|
|
+ 'warning',
|
|
|
+ this.$t('system.noticeCircular.NoInformation')
|
|
|
+ )
|
|
|
+ }
|
|
|
+ this.appendixIdss2 = item.poundImg
|
|
|
+ this.accessoryTFs2 = true
|
|
|
+ },
|
|
|
handleClose() {
|
|
|
this.accessoryTFs = false
|
|
|
},
|
|
|
@@ -574,6 +598,7 @@
|
|
|
this.money = ''
|
|
|
this.collectionDate = ''
|
|
|
this.collectionScreenshot = ''
|
|
|
+ this.$refs.upload.clearFiles()
|
|
|
this.dialogFormVisible1 = false
|
|
|
this.getList()
|
|
|
})
|
