|
@@ -120,36 +120,39 @@
|
|
|
</div>
|
|
|
<div>
|
|
|
<div style='margin-top:10px;text-align:right;width:90%;'>
|
|
|
- <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回
|
|
|
+ <el-button class="bg-bottom" type="primary" size="small" @click="submit(0)">驳回
|
|
|
</el-button>
|
|
|
- <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过
|
|
|
+ <el-button class="bg-bottom" type="primary" size="small" @click="submit(1)">通过
|
|
|
</el-button>
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-dialog
|
|
|
- title="驳回"
|
|
|
+ :title="title"
|
|
|
:visible.sync="rejectshow"
|
|
|
width="30%"
|
|
|
:before-close="handleClose">
|
|
|
- <span>驳回原因</span>
|
|
|
+ <span>{{title}}原因</span>
|
|
|
<div><el-input
|
|
|
type="textarea"
|
|
|
:rows="2"
|
|
|
- placeholder="请输入驳回原因"
|
|
|
+ :placeholder="'请输入'+title+'原因'"
|
|
|
v-model="textarea">
|
|
|
</el-input>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="rejectclick">确 定</el-button>
|
|
|
+ <el-button @click="rejectshow = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="title=='驳回'?rejectclick():pass()">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
+ import {
|
|
|
+ woekflowhandle
|
|
|
+ } from '@/model/tasksport/index'
|
|
|
import {lookexenseinfo,getcontract,getwarehouse,addexenseinfo,getwarehousingorder,editexenseinfo} from '@/model/profitable/index'
|
|
|
export default {
|
|
|
components: {
|
|
@@ -169,7 +172,10 @@
|
|
|
moneys:'按重量自动分配',
|
|
|
goods:'全部货品',
|
|
|
goodsList:[],
|
|
|
+ title:'驳回',
|
|
|
srcList:[],
|
|
|
+ textarea:'',
|
|
|
+ size:9,
|
|
|
warecontractList:[],
|
|
|
feeDetailsDistributions:[{proDate:'',weight:'',money:'',warehouse:'',belonging:'',index:0}],
|
|
|
deptBudgetList:{},
|
|
@@ -212,7 +218,9 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
-
|
|
|
+ handleClose(){
|
|
|
+ this.rejectshow=false
|
|
|
+ },
|
|
|
onChange() {
|
|
|
this.$refs.upload
|
|
|
.handleSaveBill()
|
|
@@ -239,7 +247,8 @@
|
|
|
getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:e}).toPromise()
|
|
|
.then(response => {
|
|
|
for (let i = 0; i < response.length; i++) {
|
|
|
- arr.push({time:response[i].issuingTime,id:response[i].id,weight:response[i].inWarehouseWeight})
|
|
|
+ response[i].issuingDate=response[i].issuingTime.split(' ')[0]
|
|
|
+ arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight})
|
|
|
}
|
|
|
this.$set(this.datelist,index,JSON.parse(JSON.stringify(arr)))
|
|
|
})
|
|
@@ -327,7 +336,7 @@
|
|
|
returnsales(){
|
|
|
this.$router.go(-1)
|
|
|
},
|
|
|
- submit(){
|
|
|
+ submit(status){
|
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
|
if(!this.feeDetailsDistributions[i].distributionMoney){
|
|
|
this.$message({
|
|
@@ -429,7 +438,8 @@
|
|
|
|
|
|
// this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
|
|
|
this.deptBudgetList.flag=3
|
|
|
- this.$confirm('确定提交分配信息', '提示', {
|
|
|
+ if(status==1){
|
|
|
+ this.$confirm('确定提交分配信息', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
@@ -437,9 +447,18 @@
|
|
|
.then(() => {
|
|
|
editexenseinfo(this.deptBudgetList).toPromise()
|
|
|
.then(response => {
|
|
|
- this.pass()
|
|
|
+ this.title='通过'
|
|
|
+ this.rejectshow=true
|
|
|
})
|
|
|
})
|
|
|
+ }else{
|
|
|
+ editexenseinfo(this.deptBudgetList).toPromise()
|
|
|
+ .then(response => {
|
|
|
+ this.title='驳回'
|
|
|
+ this.rejectshow=true
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
pass(){
|
|
|
this.$confirm('确认通过请款信息?', '提示', {
|
|
@@ -451,7 +470,7 @@
|
|
|
woekflowhandle({
|
|
|
taskId: this.deptBudgetList.taskId,
|
|
|
approved:true,
|
|
|
- auditMind: '34',
|
|
|
+ auditMind: this.textarea,
|
|
|
needReapply: true,
|
|
|
}).toPromise()
|
|
|
.then((response) => {
|
|
@@ -459,6 +478,7 @@
|
|
|
message: '通过成功!',
|
|
|
type: 'success',
|
|
|
})
|
|
|
+ this.rejectshow=false
|
|
|
this.$router.go(-1)
|
|
|
}).catch((response) => {
|
|
|
this.$message({
|
|
@@ -546,7 +566,8 @@
|
|
|
getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:this.feeDetailsDistributions[i].warehouseName}).toPromise()
|
|
|
.then(response1 => {
|
|
|
for (let i = 0; i < response1.length; i++) {
|
|
|
- arr.push({time:response1[i].issuingTime,id:response1[i].id,weight:response1[i].inWarehouseWeight})
|
|
|
+ response1[i].issuingDate=response1[i].issuingTime.split(' ')[0]
|
|
|
+ arr.push({time:response1[i].issuingDate,id:response1[i].id,weight:response1[i].inWarehouseWeight})
|
|
|
}
|
|
|
this.$set(this.datelist,i,JSON.parse(JSON.stringify(arr)))
|
|
|
console.log(this.feeDetailsDistributions,this.datelist)
|
|
@@ -687,4 +708,13 @@
|
|
|
/deep/.el-form-item {
|
|
|
width: 50%;
|
|
|
}
|
|
|
+/deep/.el-upload--picture-card{
|
|
|
+ width: 100px;
|
|
|
+ height:100px;
|
|
|
+ line-height:100px;
|
|
|
+}
|
|
|
+/deep/.el-upload-list--picture-card .el-upload-list__item{
|
|
|
+ width: 110px;
|
|
|
+ height:140px;
|
|
|
+}
|
|
|
</style>
|