Commit 68ed4b97 authored by dragondean@qq.com's avatar dragondean@qq.com

编辑路线价格不可修改商品

parent fc02658c
...@@ -783,10 +783,10 @@ export default { ...@@ -783,10 +783,10 @@ export default {
this.calculationPrice() this.calculationPrice()
}, },
'form.packageTypeArr'(val){ /* 'form.packageTypeArr'(val){
console.log('packageType', val, val.length) console.log('packageType', val, val.length)
this.$set(this.form, 'packageType', val ? val.join(',') : '') this.$set(this.form, 'packageType', val ? val.join(',') : '')
}, }, */
'form.isExternalWarehouse'(isExternalWarehouse){ 'form.isExternalWarehouse'(isExternalWarehouse){
// 勾选外部仓则添加一个默认的,取消则删除默认的空的 // 勾选外部仓则添加一个默认的,取消则删除默认的空的
if(!isExternalWarehouse){ if(!isExternalWarehouse){
...@@ -1067,6 +1067,7 @@ export default { ...@@ -1067,6 +1067,7 @@ export default {
item.channelIds = Array.from(item.channelIdSet).join(',') item.channelIds = Array.from(item.channelIdSet).join(',')
} }
}) })
this.form.packageType = this.form.packageTypeArr.join(',')
// 修改的提交 // 修改的提交
if (this.form.orderNo != null) { if (this.form.orderNo != null) {
let data = Object.assign({}, this.form, { let data = Object.assign({}, this.form, {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<div> <div>
<el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button> <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button>
<el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button> <el-button v-if="!isExamine" @click="goBpm" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
<el-button v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button> <el-button v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
<el-button @click="$parent.show = false;">{{$t('不,再考虑考虑')}}</el-button> <el-button @click="$parent.show = false;">{{$t('不,再考虑考虑')}}</el-button>
</div> </div>
...@@ -75,6 +75,10 @@ export default { ...@@ -75,6 +75,10 @@ export default {
}) })
}, },
methods:{ methods:{
goBpm(){
this.$parent.show = false
this.$router.push({query:{id:this.details.formId},path:'/bpm/process-instance/detail'})
},
submit(){ submit(){
this.params.orderId = this.orderDetails.orderId; this.params.orderId = this.orderDetails.orderId;
this.params.orderNo =this.orderDetails.orderNo; this.params.orderNo =this.orderDetails.orderNo;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="readonly"> <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="readonly">
<el-form-item :label="$t('商品类型')" prop="productType"> <el-form-item :label="$t('商品类型')" prop="productType">
<el-select v-model="form.productType" :disabled="!!$route.query.ids"> <el-select v-model="form.productType" :disabled="!!$route.query.action">
<el-option <el-option
v-for="type in productTypeList" v-for="type in productTypeList"
:key="type.id" :key="type.id"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品名称')" prop="titleZh"> <el-form-item :label="$t('商品名称')" prop="titleZh">
<product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.ids" /> <product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.action" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('英文名称')" prop="titleEn"> <el-form-item :label="$t('英文名称')" prop="titleEn">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment