|
|
@@ -22,34 +22,42 @@
|
|
|
</el-col>
|
|
|
<el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="12">
|
|
|
<el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
|
|
|
- maxlength="500" type="input" class="findValue">
|
|
|
+ maxlength="500" type="input">
|
|
|
<el-option v-for="item in options" :key="item.id"
|
|
|
:label="item.reportStatus?(item.contractNo + '(' + item.reportStatus + ')'):item.contractNo" :value="item.contractNo" />
|
|
|
<!-- <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey" :label="item.contractNo"
|
|
|
:value="item.contractNo" /> -->
|
|
|
</el-select>
|
|
|
- <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" >
|
|
|
+ <el-select class="selectwarehouse" v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" >
|
|
|
<el-option key="全部仓库" label="全部仓库" value="" style="color: #8890b1" />
|
|
|
<el-option v-for="item in warehouseList1" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
|
|
|
</el-select>
|
|
|
- <el-select v-model="carType" filterable placeholder="" @change="carTypeChange" >
|
|
|
+ <el-select v-model="carType" filterable placeholder="" @change="carTypeChange" >
|
|
|
<el-option key="全部" label="全部" value="" style="color: #8890b1" />
|
|
|
<el-option key="未卸车" label="未卸车" value="1" style="color: #8890b1" />
|
|
|
<el-option key="已卸车" label="已卸车" value="2" style="color: #8890b1" />
|
|
|
</el-select>
|
|
|
- <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
|
|
|
+ <!-- -->
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
+
|
|
|
+ <div v-hasPermission="`report.transportationReport.wuliu`" style="display:flex;align-items:center;justify-content: flex-start;" v-if="contractNo!='全部合同'&&warehouseList.records.length>0"><div style="width:100px;">粮食单价：</div> <div v-if="grainPricetext=='编辑'">{{grainPrice}}</div><el-input style="margin:0;" v-else v-model="grainPrice"></el-input><el-button style="margin:0 0 0 5px;" type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div></el-col>
|
|
|
+ <el-col style="padding-left: 15px;text-align:right;" :span="12">
|
|
|
+ <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
|
|
|
+ </el-date-picker>
|
|
|
+ <el-input v-model="carNo" placeholder="可按车牌号进行查找" clearable maxlength="500" type="input"
|
|
|
class="findValue" @keyup.enter.native="find()"></el-input>
|
|
|
<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
|
|
|
vertical-align: text-top;
|
|
|
position: relative;
|
|
|
top: 0px;
|
|
|
left: -8px;
|
|
|
- " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
|
|
|
+ " src="../../../public/img/sousuo.png" alt="" /></ws-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row>
|
|
|
- <div v-hasPermission="`report.transportationReport.wuliu`" style="display:flex;align-items:center;justify-content: flex-start;" v-if="contractNo!='全部合同'&&warehouseList.records.length>0"><div style="width:100px;">粮食单价：</div> <div v-if="grainPricetext=='编辑'">{{grainPrice}}</div><el-input style="margin:0;" v-else v-model="grainPrice"></el-input><el-button style="margin:0 0 0 5px;" type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div>
|
|
|
- </el-row>
|
|
|
<el-row>
|
|
|
<div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
|
|
|
</el-row>
|
|
|
@@ -415,6 +423,34 @@
|
|
|
<img style="width: 100px; height: 100px" :src="item" alt="" />
|
|
|
</div> -->
|
|
|
</WinseaContentModal>
|
|
|
+ <WinseaContentModal v-model="show" title="请款信息" @on-cancel="handleClose3">
|
|
|
+ <el-form>
|
|
|
+ <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
|
|
|
+ <el-input class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
|
|
|
+ <el-input class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
|
|
|
+ <el-input class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
|
|
|
+ <el-input class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label-width='100px' label="备注" span="1" prop="bankBranch">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ :rows="5"
|
|
|
+ placeholder="选填，不超过50个字"
|
|
|
+ v-model="deptBudgetList.remark">
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="handleClose3">取 消</el-button>
|
|
|
+ <el-button @click="submitdata">提交</el-button>
|
|
|
+ </div>
|
|
|
+ </WinseaContentModal>
|
|
|
</div>
|
|
|
<!-- </div> -->
|
|
|
</template>
|
|
|
@@ -466,9 +502,55 @@ export default {
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
+ value2:[],
|
|
|
alreadyInvoice: '',
|
|
|
needReapply: true,
|
|
|
totalList:[],
|
|
|
+ carNo:'',
|
|
|
+ deptBudgetList:{},
|
|
|
+ pickerOptions: {
|
|
|
+ shortcuts: [{
|
|
|
+ text: '本周',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date()
|
|
|
+ const start = new Date()
|
|
|
+ var thisDay = start.getDay()
|
|
|
+ var thisDate = start.getDate()
|
|
|
+ if (thisDay != 0) {
|
|
|
+ start.setDate(thisDate - thisDay)
|
|
|
+ }
|
|
|
+ picker.$emit('pick', [start, end])
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: '本月',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date()
|
|
|
+ const start = new Date()
|
|
|
+ start.setDate(1)
|
|
|
+ picker.$emit('pick', [start, end])
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: '本季度',
|
|
|
+ onClick(picker) {
|
|
|
+ var oDate = new Date()
|
|
|
+
|
|
|
+ var thisYear = oDate.getFullYear()
|
|
|
+ var thisMonth = oDate.getMonth() + 1
|
|
|
+
|
|
|
+ var n = Math.ceil(thisMonth / 3) // 季度
|
|
|
+
|
|
|
+ var Month = n * 3 - 1
|
|
|
+
|
|
|
+ var start = new Date(thisYear, Month - 2, 1)
|
|
|
+ var end = new Date()
|
|
|
+
|
|
|
+ picker.$emit('pick', [start, end])
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
dialogFormVisible1: false,
|
|
|
dialogFormVisible2: false,
|
|
|
dialogFormVisible3: false,
|
|
|
@@ -507,7 +589,6 @@ export default {
|
|
|
year: '',
|
|
|
options: [],
|
|
|
id: '',
|
|
|
- value2: '',
|
|
|
deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
@@ -568,6 +649,7 @@ export default {
|
|
|
month: dayjs().format('MM'),
|
|
|
},
|
|
|
carType:'',
|
|
|
+ show:false,
|
|
|
settlementPrice:0,
|
|
|
amountNotPayable: 0,
|
|
|
amountEdPayable: 0,
|
|
|
@@ -595,6 +677,16 @@ export default {
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ datechange(e){
|
|
|
+ if (this.value2) {
|
|
|
+ this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
|
|
|
+ this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
|
|
|
+ } else {
|
|
|
+ this.startDate = ''
|
|
|
+ this.endDate = ''
|
|
|
+ }
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
async exportlist() {
|
|
|
if(this.modification.length>0){
|
|
|
const {
|
|
|
@@ -809,6 +901,9 @@ export default {
|
|
|
handleClose2() {
|
|
|
this.paymentImg = false
|
|
|
},
|
|
|
+ handleClose3() {
|
|
|
+ this.show = false
|
|
|
+ },
|
|
|
//账户
|
|
|
look(item) {
|
|
|
this.dialogFormVisible8 = true
|
|
|
@@ -1408,17 +1503,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
var arr=this.ArrSet(this.modification,this.contractNo)
|
|
|
-
|
|
|
- this.$confirm(`是否确定请款？`, {
|
|
|
- cancelButtonText: '取消',
|
|
|
- confirmButtonText: '确定',
|
|
|
- type: 'warning',
|
|
|
- }).then(() => {
|
|
|
- submitlogistics({tranSettlementReportList:this.modification}).toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.$message.success('请款成功')
|
|
|
- this.getList()
|
|
|
- })
|
|
|
+ this.show=true
|
|
|
+ // this.$confirm(`是否确定请款？`, {
|
|
|
+ // cancelButtonText: '取消',
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // type: 'warning',
|
|
|
+ // }).then(() => {
|
|
|
+ // submitlogistics({tranSettlementReportList:this.modification}).toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.$message.success('请款成功')
|
|
|
+ // this.getList()
|
|
|
+ // })
|
|
|
//批次通过 选中列表中 数据一个batchId， 选中列表去重
|
|
|
// var obj = {};
|
|
|
// that.modification = that.modification.reduce(function (item, next) {
|
|
|
@@ -1427,9 +1522,32 @@ export default {
|
|
|
// }, []);
|
|
|
// console.log('去重后提交数据', that.modification);
|
|
|
// that.audit(this.modification[0], 0, true, 2)
|
|
|
- })
|
|
|
+ // })
|
|
|
}
|
|
|
},
|
|
|
+ submitdata(){
|
|
|
+ this.deptBudgetList.tranSettlementReportList=this.modification
|
|
|
+ this.$confirm(`是否确定请款？`, {
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ type: 'warning',
|
|
|
+ }).then(() => {
|
|
|
+ submitlogistics(this.deptBudgetList).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.show=false
|
|
|
+ this.$message.success('请款成功')
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ // 批次通过 选中列表中 数据一个batchId， 选中列表去重
|
|
|
+ // var obj = {};
|
|
|
+ // that.modification = that.modification.reduce(function (item, next) {
|
|
|
+ // obj[next.batchId] ? '' : obj[next.batchId] = true && item.push(next);
|
|
|
+ // return item;
|
|
|
+ // }, []);
|
|
|
+ // console.log('去重后提交数据', that.modification);
|
|
|
+ // that.audit(this.modification[0], 0, true, 2)
|
|
|
+ })
|
|
|
+ },
|
|
|
handleSelectionChange(val) {
|
|
|
if (val.length !== 0) {
|
|
|
this.totalList = this.countTotal(val)
|
|
|
@@ -1506,7 +1624,10 @@ export default {
|
|
|
searchType: this.searchType,
|
|
|
contractNo: this.contractNo,
|
|
|
manualFlag: this.manualFlag,
|
|
|
- carType:this.carType
|
|
|
+ carType:this.carType,
|
|
|
+ carNo:this.carNo,
|
|
|
+ startDate:this.startDate,
|
|
|
+ endDate:this.endDate
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -1577,7 +1698,7 @@ export default {
|
|
|
} else {
|
|
|
//不是第一项时，就根据标识去存储
|
|
|
if (data[index].warehouseNumViewList.length > 1) {
|
|
|
- 查找到符合条件的数据时每次要把之前存储的数据 + 1
|
|
|
+ // 查找到符合条件的数据时每次要把之前存储的数据 + 1
|
|
|
this.spanArr[this.pos] = data[index].warehouseNumViewList.length
|
|
|
this.spanArr.push(0)
|
|
|
} else {
|
|
|
@@ -1594,7 +1715,7 @@ export default {
|
|
|
'Y+': date.getFullYear().toString(), // 年
|
|
|
'm+': (date.getMonth() + 1).toString(), // 月
|
|
|
'd+': date.getDate().toString(), // 日
|
|
|
- 'H+': date.getHours().toString(), // 时
|
|
|
+ // 'H+': date.getHours().toString(), // 时
|
|
|
// "M+": date.getMinutes().toString(), // 分
|
|
|
// "S+": date.getSeconds().toString() // 秒
|
|
|
// 有其他格式化字符需求可以继续添加，必须转化成字符串
|
|
|
@@ -1883,7 +2004,7 @@ export default {
|
|
|
.el-input--small {
|
|
|
font-size: 13px;
|
|
|
width: 390px;
|
|
|
- margin-left: 74%;
|
|
|
+ // margin-left: 74%;
|
|
|
}
|
|
|
|
|
|
/deep/.el-table .el-table__header .cell,
|
|
|
@@ -1925,9 +2046,11 @@ hr {
|
|
|
width: 66%;
|
|
|
margin-left: 9%;
|
|
|
}
|
|
|
-
|
|
|
.el-date-editor.el-input,
|
|
|
-.el-date-editor.el-input__inner,
|
|
|
+.el-date-editor.el-input__inner{
|
|
|
+ width:40% !important;
|
|
|
+}
|
|
|
+
|
|
|
.el-input-number--small {
|
|
|
width: 123% !important;
|
|
|
}
|
|
|
@@ -1954,4 +2077,10 @@ hr {
|
|
|
border: 1px solid #5473e8;
|
|
|
color: #5473e8;
|
|
|
}
|
|
|
+ /deep/.el-select{
|
|
|
+ width:30%;
|
|
|
+ }
|
|
|
+ // .selectwarehouse{
|
|
|
+ // margin-left:5px;
|
|
|
+ // }
|
|
|
</style>
|
