修复bug

src/components/CustomerFollow/index.vue

@@ -173,7 +173,34 @@ export default {
         if (!valid) {
           return
         }
-
+        if(!this.customerFollow.form.followType){
+          this.$modal.msgError("请选择跟进类型");
+          return
+        }
+        if(!this.customerFollow.form.followTime){
+          this.$modal.msgError("请选择跟进时间");
+          return
+        }
+        if(!this.customerFollow.form.contactName){
+          this.$modal.msgError("请选择联系人");
+          return
+        }
+        if(!this.customerFollow.form.followUserId){
+          this.$modal.msgError("请选择跟进业务");
+          return
+        }
+        if(!this.customerFollow.form.followMethod){
+          this.$modal.msgError("请选择跟进方式");
+          return
+        }
+        if(!this.customerFollow.form.feedback){
+          this.$modal.msgError("请输入客户反馈");
+          return
+        }
+        if(!this.customerFollow.form.result){
+          this.$modal.msgError("请输入处理结果");
+          return
+        }
         createCustomerFollow(this.customerFollow.form).then(r => {
           this.resetCustomerFollowForm()
           this.getCustomerFollowList()

src/components/CustomerFollowList/index.vue

@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="跟进时间" required>
-              <el-date-picker v-model="customerFollow.form.followTime" type="datetime" placeholder="选择跟进时间"></el-date-picker>
+              <el-date-picker v-model="customerFollow.form.followTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择跟进时间"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -103,8 +103,10 @@ export default {
   },
 
   created() {
+    this.resetCustomerFollowForm()
     if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
       this.customerContactsList = r.data
+      this.customerFollow.form.customerId = this.customerId
     })
     listServiceUser().then(r => {
       this.serviceUserList = r.data
@@ -116,7 +118,34 @@ export default {
         if (!valid) {
           return
         }
-
+       if(!this.customerFollow.form.followType){
+          this.$modal.msgError("请选择跟进类型");
+          return
+        }
+        if(!this.customerFollow.form.followTime){
+          this.$modal.msgError("请选择跟进时间");
+          return
+        }
+        if(!this.customerFollow.form.contactName){
+          this.$modal.msgError("请选择联系人");
+          return
+        }
+        if(!this.customerFollow.form.followUserId){
+          this.$modal.msgError("请选择跟进业务");
+          return
+        }
+        if(!this.customerFollow.form.followMethod){
+          this.$modal.msgError("请选择跟进方式");
+          return
+        }
+        if(!this.customerFollow.form.feedback){
+          this.$modal.msgError("请输入客户反馈");
+          return
+        }
+        if(!this.customerFollow.form.result){
+          this.$modal.msgError("请输入处理结果");
+          return
+        }
         createCustomerFollow(this.customerFollow.form).then(r => {
           this.resetCustomerFollowForm()
           this.customerFollow.dialogVisible = false
@@ -126,7 +155,8 @@ export default {
 
     resetCustomerFollowForm() {
       this.customerFollow.form = {
-        "bizId":undefined,
+        "bizId":this.id,
+        "customerId":this.customerId,
         "contactName": undefined,
         "feedback": undefined,
         "followMethod": undefined,

src/views/ecw/customerComplaint/index.vue

@@ -266,14 +266,14 @@
           <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 prop="ascertainReason">
+        <el-form-item v-show="form.status == '2'" label="查明原因" required >
           <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 prop="result">
+        <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="赔付金额">
@@ -287,7 +287,7 @@
               :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
           </el-input>
         </el-form-item>
-        <el-form-item v-show="form.status == '3'" label="处理时间" required prop="handleAt">
+        <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" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </el-form>
@@ -360,9 +360,6 @@ 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: [],
@@ -491,13 +488,28 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        console.log(valid)
-        console.log(this.form.handleAt)
         if (!valid) {
           return;
         }
+
         // 修改的提交
         if (this.form.id != null) {
+          if(this.form.status==2){
+            if(!this.form.ascertainReason){
+              this.$modal.msgError("请输入查明原因");
+              return
+            }
+          }
+          if(this.form.status==3){
+            if(!this.form.result){
+              this.$modal.msgError("请输入处理结果");
+              return
+            }
+            if(!this.form.handleAt){
+              this.$modal.msgError("请输入处理时间");
+              return
+            }
+          }
           updateCustomerComplaint(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;

src/views/ecw/order/exception/index.vue

@@ -147,7 +147,6 @@ import {DICT_TYPE} from  '@/utils/dict'
 import { userList } from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
-import getProduct from '@/api/ecw/product'
 
 export default {
   name: "Exception",

src/views/ecw/order/pending.vue

@@ -106,6 +106,7 @@ import {getExceptionListByOrderId} from "@/api/ecw/orderException"
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
 import FilePreview from '@/components/FilePreview'
+import {getProduct} from '@/api/ecw/product'
 
 export default {
   name: "Pending",
@@ -158,15 +159,14 @@ export default {
 
     handEdit(row){
       if(row.orderExceptionType=='order_no_quote_exception'){
+        let url = '../../lineProject/product-price/edit'
+
+        if(row.orderItem){
           getProduct(row.orderItemId).then(res=>{
-          this.$router.push({
-            name: 'ProductPrice',
-            query: {
-              product_id: row.orderItemId,
-              product_type: res.data.typeId
-            }
-          })
+              url = '../../lineProject/product-price/edit?product_id='+row.orderItemId+'&product_type='+res.data.typeId
           })
+        }
+        return this.$router.push(url)
       }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
         this.$router.push({
           path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,