Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 3 years ago
parent
commit
61faf3e0e1
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml
  3. 36
      anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
  4. 1
      anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue
  5. 1
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
  6. 172
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue
  7. 173
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue
  8. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
  9. 29
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  10. 21
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  11. 697
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  12. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  13. 19
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java

@ -40,7 +40,7 @@ public class BusVehicleApplySzVo implements Vo {
private String otherConfig;
@ApiModelProperty(value = "上装sid")
private String sid;
private String szSid;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml

@ -23,7 +23,7 @@
sz.refrigerator,
sz.coverPlate,
sz.floorHeating,
sz.sid
sz.sid szSid
from bus_vehicle_apply_sz bva
left join base_model_szconfig sz on sz.sid = bva.szSid
where bva.detailsSid = #{sid}

36
anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js

@ -40,10 +40,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/complete',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务驳回任务
@ -51,10 +48,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/reject',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务终止任务
@ -62,10 +56,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/breakProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务撤回任务
@ -73,31 +64,22 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/revokeProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
getNextNodesForSubmit: function(data) {
return request({
url: '/scm/v1/scmapplyinbound/getNextNodesForSubmit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
method: 'get',
params: data
})
},
getPreviousNodesForReject(formobj) {
getPreviousNodesForReject(data) {
return request({
url: '/scm/v1/scmapplyinbound/getPreviousNodesForReject',
method: 'post',
data: formobj,
headers: {
'Content-Type': 'application/json'
}
method: 'get',
params: data
})
}
}

1
anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue

@ -148,6 +148,7 @@ export default {
this.$emit('fileChange', this.files)
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
//

1
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@ -56,6 +56,7 @@
<el-table-column prop="orderDate" label="采购订单日期" align="center" width="120"/>
<el-table-column prop="orderType" label="采购订单类型" align="center" width="120"/>
<el-table-column prop="applicationCode" label="排产申请编号" align="center" width="200"/>
<el-table-column prop="subscriptionDate" label="认款日期" align="center" width="100"/>
<el-table-column prop="insideCode" label="内部编码" header-align="center" align="left" width="120"/>
<el-table-column prop="vehicleName" label="车型" align="center" width="200"/>
<el-table-column prop="platformNo" label="台数" align="center" width="80"/>

172
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue

@ -1,93 +1,104 @@
<template>
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
<div class="app-container">
<div v-show="viewState == 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
</el-col>
</el-row>
</el-form>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item>
<span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
<el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!--End 添加修改部分-->
<cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
</div>
</template>
<script>
import req from '@/api/cheliang/busvehicleorder'
import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
export default {
name: 'cheliangcaigouAdd',
components: {
cheliangpaichanInfo
},
data() {
return {
viewState: 1,
viewTitle: '【编辑】采购订单',
formobj: {
applicationCode: '',
@ -180,6 +191,13 @@ export default {
return false
}
})
},
handleLook(sid) {
this.viewState = 2
this.$refs['divPaiChan'].showInfo(sid)
},
resetState() {
this.viewState = 1
}
}
}

173
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue

@ -1,91 +1,102 @@
<template>
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
<div class="app-container">
<div v-show="viewState == 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item>
<span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
<el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!--End 添加修改部分-->
<cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
</div>
</template>
<script>
import req from '@/api/cheliang/busvehicleorder'
import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
export default {
name: 'cheliangcaigouAdd',
components: {
cheliangpaichanInfo
},
data() {
return {
viewState: 1,
viewTitle: '采购订单详情',
formobj: {},
rules: {},
@ -104,10 +115,16 @@ export default {
req.fetchBySid(row.sid).then(resp => {
const vdata = resp.data
this.formobj = vdata
}).catch(e => {
this.formobj = row
})
.catch(e => {
this.formobj = row
})
},
handleLook(sid) {
this.viewState = 2
this.$refs['divPaiChan'].showInfo(sid)
},
resetState() {
this.viewState = 1
}
}
}

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue

@ -30,7 +30,7 @@
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>巡检情况说明</span></div>
<el-form-item>
<el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
<el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="对车辆外观、车辆状态、电瓶情况、箱内燃油情况等进行说明" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col>
</el-row>

29
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -97,7 +97,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -111,7 +111,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -260,6 +260,17 @@ export default {
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
}
},
inputOnceFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
@ -289,7 +300,6 @@ export default {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
} else {
this.formobj.moneyCount = 0
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
}
@ -325,10 +335,14 @@ export default {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
}
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.corrMoneyTwo = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyTwo
},
inputEligibleProportionThree() {
@ -394,10 +408,15 @@ export default {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
}
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.corrMoneyThree = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyThree
},
inputMoneyCount() {

21
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -186,16 +186,16 @@
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-row v-show="currentLink" style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :class="{'rowClass':!currentLink}">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -321,12 +321,12 @@ export default {
}, '*')
},
methods: {
showInfo(sid, row) {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '入账单'
console.log('编辑回显', sid, row)
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj = data
@ -351,7 +351,7 @@ export default {
this.policyThreeChecked = false
}
}).catch(e => {
this.formobj = row
this.formobj = {}
})
},
magnify(val) {
@ -509,4 +509,7 @@ export default {
.freight {
color: #FFFFFF;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

697
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -1,75 +1,149 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div >
<div class="wlInfo"><span>车辆入账单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="申请编号:" />
<div class="listconadd">
<div class="titwu"><span>车辆入账申请单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row class="rowStyle">
<el-col :span="20" class="colOneStyle"></el-col>
<el-col :span="4" class="tleftb colOneStyle">
<span style="font-size: 16px">金额单位</span>
</el-col>
</el-row>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb"><span>分公司</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.useOrgName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.applicationDate }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>申请人</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.applicationName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>车型</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.modelName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.configName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.applicationCode" readonly />
</el-form-item>
<el-form-item>{{ formobj.contractPrice }}</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="采购订单编号:" />
<el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.purchaseOrderNo" readonly />
</el-form-item>
<el-form-item><el-input v-model="formobj.szPriceCalBasis" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="申请人:" />
</el-row>
<el-row>
<el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
<el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.applicationName" readonly />
</el-form-item>
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="车型:" />
<div class="title">
<div>政策详情(含签单折让开票下浮等)</div>
<el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>政策1</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.modelName" readonly />
</el-form-item>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="10" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策2</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyTwo" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策3</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyThree" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="常用配置:" />
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.moneyCount" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="14">
<el-form-item><el-input v-model="formobj.policyRemarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
<el-col :span="21">
<upload_picture ref="imgUpload" v-model="imgList" bucket="map" :upload-data="{type:'0001'}"/>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.configName" readonly />
</el-form-item>
<el-form-item>{{ inputMoneyCount() }}</el-form-item>
</el-col>
</el-row>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column label="车架号" align="left" header-align="center">
<template slot-scope="scope" prop="vehicleName">
<el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable />
@ -81,79 +155,102 @@
</template>
</el-table-column>
</el-table>
<el-row style="margin-top: 10px">
<el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="厂家发车日期:" />
</el-col>
<el-col :span="21">
<el-form-item>
<el-date-picker v-model="formobj.departureDate" value-format="yyyy-MM-dd" clearable type="date" placeholder="开始日期" />
</el-form-item>
</el-col>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
<el-col :span="9">
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" placeholder="开始日期"/></el-form-item>
</el-col>
</el-row>
<el-row class="linethree">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="备注:" />
<el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
<el-col :span="9">
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" placeholder="开始日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>备注</span></el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.remarks" clearable />
</el-form-item>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
</div>
</template>
<script>
import req from '@/api/ruzhang/scmapplyinbound'
import upload_picture from '@/components/uploadFile/upload_picture'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
export default {
name: 'RuzhangAdd',
name: 'ruzhangEdit',
components: {
upload_picture
},
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
freightChecked: false, //
policyOneChecked: false, // 2 1
policyTwoChecked: false, // 3 1
policyThreeChecked: false, // 3 2
imgList: [],
//
formobj: {
sid: '', // sid
applicationSid: window.sessionStorage.getItem('userSid'), // sid
applicationName: window.sessionStorage.getItem('name'), //
orgSidPath: window.sessionStorage.getItem('orgSidPath'),
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid'), // sid
applicationCode: '', //
amongSzPrice: '',
applicationCode: '',
applicationDate: '',
applicationName: '',
applicationSid: '',
configName: '',
configSid: '',
contractPrice: '',
corrMoneyThree: '',
corrMoneyTwo: '',
costPrice: '',
departureDate: '',
eligibleAmountOne: '',
eligibleProportionThree: '',
eligibleProportionTwo: '',
insideCode: '',
modelName: '',
modelSid: '',
moneyCount: '',
nodeState: '',
num: '',
onceFreight: '',
policyOne: '',
policyRemarks: '',
policyThree: '',
policyTwo: '',
priceDate: '',
purchaseOrderNo: '',
remarks: '', //
vehicleOrderSid: '',
businessSid: '', // sid
procInsId: '', // id
taskId: '', // id
vehicleList: []
remarks: '',
secondaryFreight: '',
userSid: '',
useOrgName: '',
useOrgSid: '',
deductionFreight: '',
deductionPolicyThreeOne: '',
deductionPolicyThreeTwo: '',
deductionPolicyTwoOne: '',
scmFiles: [],
vehicleList: [],
vehicleOrderSid: ''
},
rules: {},
submitdisabled: false
}
},
created() {
// ===
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
//
this.formobj.businessSid = obj.businessSid
this.formobj.procInsId = obj.instanceId
this.formobj.taskId = obj.taskId
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
@ -164,152 +261,390 @@ export default {
}, '*')
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.useOrgSid).then((res) => {
if (res.success) {
this.formobj.useOrgName = res.data.name
}
})
}
})
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
}
},
inputOnceFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
inputSecondaryFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changeFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyOne() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyTwo() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyThree() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
inputEligibleAmountOne() {
if (this.formobj.eligibleAmountOne !== '') {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
} else {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
}
},
inputEligibleProportionTwo() {
if (this.formobj.eligibleProportionTwo !== '') {
if (this.policyOneChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
}
} else {
this.formobj.corrMoneyTwo = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyTwo
},
inputEligibleProportionThree() {
if (this.formobj.eligibleProportionThree !== '') {
if (this.policyTwoChecked && this.policyThreeChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else if (this.policyTwoChecked && !this.policyThreeChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else if (!this.policyTwoChecked && this.policyThreeChecked) {
if (this.freightChecked) {
if (this.policyOneChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
}
} else {
this.formobj.corrMoneyThree = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyThree
},
inputMoneyCount() {
if (this.formobj.moneyCount === '') {
this.formobj.moneyCount = 0
}
this.formobj.costPrice = parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.moneyCount)
return this.formobj.costPrice
},
multiplication(arg1, arg2) {
var m = 0
var s1 = arg1.toString()
var s2 = arg2.toString()
try {
m += s1.split('.')[1].length
} catch (e) {}
try {
m += s2.split('.')[1].length
} catch (e) {}
return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】入账单'
req.fetchBySid(sid).then((resp) => {
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj.applicationCode = data.applicationCode
this.formobj.remarks = data.remarks
this.formobj.sid = sid
this.formobj.configName = data.configName
this.formobj.departureDate = data.departureDate
this.formobj.modelName = data.modelName
this.formobj.modelSid = data.modelSid
this.formobj.purchaseOrderNo = data.purchaseOrderNo
this.formobj.vehicleOrderSid = data.vehicleOrderSid
this.formobj.taskDefKey = data.taskDefKey
this.formobj.taskId = data.taskId
this.formobj.nodeState = data.nodeState
if (data.inboundVehicleList.length > 0) {
data.inboundVehicleList.forEach((e) => {
this.formobj.vehicleList.push({
applySid: e.applySid,
remarks: e.remarks,
modelSid: e.modelSid,
sid: e.sid,
vinNo: e.vinNo
this.formobj = data
this.formobj.userSid = window.sessionStorage.getItem('userSid')
if (this.formobj.scmFiles.length > 0) {
this.formobj.scmFiles.forEach((e) => {
this.imgList.push({
name: e.fileName,
filePath: e.filePath,
size: e.fileSize,
url: e.filePath
})
})
}
if (this.formobj.deductionFreight === '0') {
this.freightChecked = true
} else {
for (var i = 0; i < row[0].vehicleNum; i++) {
this.formobj.vehicleList.push({
applySid: '',
remarks: '',
modelSid: this.formobj.modelSid,
sid: '',
vinNo: ''
})
}
this.freightChecked = false
}
if (this.formobj.deductionPolicyTwoOne === '0') {
this.policyOneChecked = true
} else {
this.policyOneChecked = false
}
if (this.formobj.deductionPolicyTwoOne === '0') {
this.policyTwoChecked = true
} else {
this.policyTwoChecked = false
}
if (this.formobj.deductionPolicyThreeTwo === '0') {
this.policyThreeChecked = true
} else {
this.policyThreeChecked = false
}
}).catch((e) => {
this.$nextTick(() => {
this.init()
})
}).catch(e => {
this.formobj = {}
})
},
getUrl() {
if (this.imgList.length > 0) {
const aa = []
for (var i = 0; i < this.imgList.length; i++) {
aa.push({
attachType: '',
fileName: this.imgList[i].name,
filePath: this.imgList[i].filePath,
fileSize: this.imgList[i].size,
fileType: this.imgList[i].name.substr(this.imgList[i].name.lastIndexOf('.')),
linkSid: '',
name: window.sessionStorage.getItem('name'),
sid: ''
})
}
this.formobj.scmFiles = aa
}
},
saveEdit() {
this.$refs['form_obj'].validate((valid) => {
this.getUrl()
if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!')
return
}
if (this.freightChecked) {
this.formobj.deductionFreight = 0
} else {
this.formobj.deductionFreight = 1
}
if (this.policyOneChecked) {
this.formobj.deductionPolicyTwoOne = 0
} else {
this.formobj.deductionPolicyTwoOne = 1
}
if (this.policyTwoChecked) {
this.formobj.deductionPolicyThreeOne = 0
} else {
this.formobj.deductionPolicyThreeOne = 1
}
if (this.policyThreeChecked) {
this.formobj.deductionPolicyThreeTwo = 0
} else {
this.formobj.deductionPolicyThreeTwo = 1
}
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
req.saveOrUpdate(this.formobj).then(resp => {
this.submitdisabled = false
//
if(resp.success){
/* this.$message({
showClose: true,
type: 'success',
message: resp.msg
})*/
if (resp.success) {
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false
})
.catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
submitVehicleApply() {
if(this.formobj.departureDate===''){
alert('厂家发车日期不能为空');
return ;
this.getUrl()
if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!')
return
}
req.submitVehicleApply(this.formobj).then((res) => {
if (res.code == '200') {
//
window.parent.postMessage(
{
cmd: 'returnHeight',
params: {
//
code: 1
}
},
'*'
)
this.handleReturn('true')
} else {
if (this.freightChecked) {
this.formobj.deductionFreight = 0
} else {
this.formobj.deductionFreight = 1
}
if (this.policyOneChecked) {
this.formobj.deductionPolicyTwoOne = 0
} else {
this.formobj.deductionPolicyTwoOne = 1
}
if (this.policyTwoChecked) {
this.formobj.deductionPolicyThreeOne = 0
} else {
this.formobj.deductionPolicyThreeOne = 1
}
if (this.policyThreeChecked) {
this.formobj.deductionPolicyThreeTwo = 0
} else {
this.formobj.deductionPolicyThreeTwo = 1
}
req.submitVehicleApply(this.formobj).then(res => {
if (res.success) {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
type: 'success',
message: '提交成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.departureDate = ''
this.formobj.remarks = '' //
this.formobj.vehicleList = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
}
.lineone .el-form-item {
margin-bottom: -10px;
}
.lineone >>> .el-input__inner {
border: 0;
.listconadd {
height: calc(100vh - 0px) !important;
}
.linetwo {
margin-top: 10px;
.title {
display: flex;
justify-content: space-between;
align-items: center;
}
.linetwo .el-form-item {
margin-bottom: 0px !important;
.tcenterb {
text-align: center;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.linetwo >>> .el-input__inner {
border: 0;
.rowStyle {
border-left: 0px;
}
.linethree .el-form-item {
margin-bottom: 0px !important;
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.el-form-item-right {
/* padding: 0 10px 0 0; */
text-align: right;
.freight {
color: #FFFFFF;
}
</style>

18
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@ -270,8 +270,6 @@ export default {
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
},
@ -286,12 +284,12 @@ export default {
}, '*')
},
methods: {
showInfo(sid, row) {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '入账单'
console.log('编辑回显', sid, row)
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj = data
@ -316,7 +314,7 @@ export default {
this.policyThreeChecked = false
}
}).catch(e => {
this.formobj = row
this.formobj = {}
})
},
magnify(val) {
@ -356,13 +354,6 @@ export default {
code: 1
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
}
@ -371,6 +362,9 @@ export default {
</script>
<style scoped>
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
display: flex;
justify-content: space-between;

19
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@ -79,7 +79,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="24" :class="{'rowClass':!currentLink}">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputTwo" clearable ></el-input></el-form-item>
</el-col>
@ -170,7 +170,7 @@ export default {
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
@ -205,9 +205,17 @@ export default {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
this.handleStop()
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
}
},
/** 同意任务 */
@ -307,5 +315,8 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

Loading…
Cancel
Save