Skip to content

J
jiedao-app-operator-master
Commit bec5a442 authored by 我在何方's avatar 我在何方
Browse files
Options

bug修复

parent 2ed0a026
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 26 deletions
src/views/ecw/customerComplaint/index.vue
View file @ bec5a442
......@@ -170,10 +170,17 @@
<el-form-item v-show="form.status == '3'" label="处理结果" required>
<el-input type="textarea" placeholder="请输入处理结果" v-model="form.result"></el-input>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额">
<span>{{form.indemnity||0}}</span>
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="form.currencyUnit"></dict-tag>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额">
<el-input v-model="form.indemnity" placeholder="请输入赔付金额">
<dict-selector
defaultable
style="width: 110px"
placeholder="请选择货币单位"
slot="append"
v-model="form.currencyUnit"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
</el-input>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="处理时间" required>
<span>{{parseTime(form.handleAt)}}</span>
</el-form-item>
......@@ -196,7 +203,7 @@
<el-dialog :title="title" :visible.sync="openCustomer" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" label-width="80px">
<div class="formShow">
<div>
<el-form-item label="客户名称:">
......@@ -217,7 +224,7 @@
<span>{{parseTime(form.createTime)}}</span>
</el-form-item>
<el-form-item label="投诉状态:">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.type" />
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" />
</el-form-item>
</div>
</div>
......@@ -254,19 +261,19 @@
:visible.sync="handle.dialogVisible"
width="30%"
>
<el-form ref="form" :model="form" label-width="80px">
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-form-item label="投诉类型">
<dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" form-type="radio" v-model="form.status"
:filter="(e) => e.value == '2' || e.value == '3'" :formatter="Number"></dict-selector>
</el-form-item>
<el-form-item v-show="form.status == '2'" label="查明原因" required>
<el-form-item v-show="form.status == '2'" label="查明原因" required prop="ascertainReason">
<el-input type="textarea" placeholder="请输入查明原因" v-model="form.ascertainReason"></el-input>
</el-form-item>
<el-form-item v-show="form.status == '2'" label="处理方案">
<el-input v-model="form.plan" placeholder="请输入处理方案"></el-input>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="处理结果" required>
<el-form-item v-show="form.status == '3'" label="处理结果" required prop="result">
<el-input type="textarea" placeholder="请输入处理结果" v-model="form.result"></el-input>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额">
......@@ -280,8 +287,8 @@
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
</el-input>
</el-form-item>
<el-form-item v-show="form.status == '3'" label="处理时间" required>
<el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-form-item v-show="form.status == '3'" label="处理时间" required prop="handleAt">
<el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -353,6 +360,9 @@ export default {
customerId: [{ required: true, message: "客户名称不能为空", trigger: "change" }],
type: [{ required: true, message: "投诉类型不能为空", trigger: "change" }],
content: [{ required: true, message: "投诉内容不能为空", trigger: "blur" }],
ascertainReason: [{ required: true, message: "查明原因不能为空", trigger: "blur" }],
result: [{ required: true, message: "处理结果不能为空", trigger: "blur" }],
handleAt: [{ required: true, message: "处理时间不能为空", trigger: "blur" }],
},
myFollowCustomerList: [],
......@@ -481,6 +491,8 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
console.log(valid)
console.log(this.form.handleAt)
if (!valid) {
return;
}
......
src/views/ecw/order/splitApply.vue
View file @ bec5a442
......@@ -7,7 +7,7 @@
<span class="card-title">{{$t('原单信息')}}</span>
<div>
<span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
<el-button v-else type="primary" @click="addSplit">{{$t('新建拆单')}} </el-button>
<el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
</div>
</div>
<el-descriptions :column="4">
......@@ -137,7 +137,7 @@
<el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
</div>
</div>
<el-table border :data="item.orderSplitItemBackVOList">
<el-table v-if="item.orderSplitItemBackVOList" border :data="item.orderSplitItemBackVOList">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
......@@ -213,23 +213,23 @@
<el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
<el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="80px">
<el-row>
<el-form-item :label="$t('中文品名:')">
<el-form-item :label="$t('中文品名:')" v-if="splitData.length>0">
<el-select v-model="shopForm.prodTitleZh" :placeholder="$t('请选择中文品名')" @change="changeProdTitleZh">
<el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
<el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('英文品名:')" >
<el-form-item :label="$t('英文品名:')" v-if="splitData.length>0">
<el-select v-model="shopForm.prodTitleEn" :placeholder="$t('请选择英文品名')" @change="changeProdTitleEn">
<el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
<el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('剩余箱数:')">
{{shopForm.sum||0}}
</el-form-item>
<el-form-item :label="$t('放入箱数:')">
<el-input-number v-model="shopForm.num" controls-position="right" :min="1" :max="shopForm.sum"></el-input-number>
<el-input-number v-model="shopForm.num" controls-position="right" :min="1" :max="shopForm.sum-1"></el-input-number>
</el-form-item>
<el-form-item :label="$t('备注信息:')">
<el-input v-model="shopForm.remarks"></el-input>
......@@ -335,6 +335,7 @@ export default {
const tds = document.querySelectorAll(
"#table .el-table__footer-wrapper tr>td"
);
console.log(tds)
// colSpan合并列
tds[1].colSpan = 5;
tds[1].style.textAlign = "left";
......@@ -453,14 +454,14 @@ export default {
},
changeProdTitleZh(){
var list = []
list = this.orderData.orderItemVOList.filter(item=>item.prodTitleZh == this.shopForm.prodTitleZh)
list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleZh == this.shopForm.prodTitleZh)
this.shopForm.sum = list[0].num
this.shopForm.orderItemId = list[0].orderItemId
this.shopForm.prodTitleEn = list[0].prodTitleEn
},
changeProdTitleEn(){
var list = []
list = this.orderData.orderItemVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
this.shopForm.sum = list[0].num
this.shopForm.prodTitleZh = list[0].prodTitleZh
},
......@@ -514,9 +515,9 @@ export default {
},
removeShop(id){
let that = this
that.$confirm(this.$t('是否移除货物吗?')).then(function () {
that.$confirm(that.$t('是否移除货物吗?')).then(function () {
deleteSplitItem(id).then(res=>{
that.$message.success(this.$t("移除成功"));
that.$message.success(that.$t("移除成功"));
that.getList()
})
})
......@@ -524,11 +525,11 @@ export default {
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error(this.$t("请输入取消原因"));
that.$message.error(that.$t("请输入取消原因"));
return
}
cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
that.$message.success(this.$t("取消成功"));
that.$message.success(that.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
......@@ -539,9 +540,9 @@ export default {
/** 删除按钮操作 */
deleteSplit(id) {
let that = this
that.$confirm(this.$t('是否确认删除新拆的订单吗?')).then(function () {
that.$confirm(that.$t('是否确认删除新拆的订单吗?')).then(function () {
deleteSplit(id).then(res=>{
that.$message.success(this.$t("删除成功"));
that.$message.success(that.$t("删除成功"));
that.getList()
})
})
......
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