bug修复

src/components/CustomerFollow/index.vue

@@ -10,7 +10,7 @@
     >
       <el-table-column
         type="index"
-        label="#"
+        label="序号"
       >
       </el-table-column>
       <el-table-column
@@ -69,7 +69,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">
@@ -160,6 +160,7 @@ export default {
     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

src/views/ecw/customerComplaint/index.vue

@@ -86,6 +86,7 @@
                      v-hasPermi="['ecw:customer-complaint:update']" v-show="scope.row.status != 3">处理</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:customer-complaint:delete']">删除</el-button>
+           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSee(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -96,6 +97,8 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div class="formShow">
+          <div>
           <el-form-item label="客户名称" prop="customerId">
             <el-select v-model="form.customerId" placeholder="请选择客户名称" :disabled="!!customerId" filterable>
               <el-option
@@ -143,19 +146,47 @@
               </el-option>
             </el-select>
           </el-form-item>
+          </div>
+          <div v-if="form.id">
+            <el-form-item label="投诉时间">
+                <span>{{parseTime(form.createTime)}}</span>
+            </el-form-item>
+            <el-form-item label="投诉状态">
+              <dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :disabled="true" form-type="radio" v-model="form.status" :filter="(e) => e.value == '1' ||e.value == '2' || e.value == '3'"
+                             :formatter="Number"></dict-selector>
+            </el-form-item>
+          </div>
+        </div>
         <el-form-item label="投诉内容" prop="content">
           <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="处理状态" prop="status">
+        <el-form-item v-show="form.status == '2'||form.status == '3'" label="查明原因" required>
+          <el-input type="textarea" placeholder="请输入查明原因" v-model="form.ascertainReason"></el-input>
+        </el-form-item>
+        <el-form-item v-show="form.status == '2'||form.status == '3'" label="处理方案">
+          <el-input v-model="form.plan" placeholder="请输入处理方案"></el-input>
+        </el-form-item>
+
+        <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="处理时间" required>
+          <span>{{parseTime(form.handleAt)}}</span>
+        </el-form-item>
+ <!--       <el-form-item label="处理状态" prop="status" v-if="form.id">
           <span v-if="!form.id">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS, 1) }}</span>
           <el-select v-else v-model="form.status" placeholder="请选择处理状态">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS)"
                        :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
 
-      <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow>
+      <!-- <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow> -->
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -163,6 +194,61 @@
       </div>
     </el-dialog>
 
+
+    <el-dialog :title="title" :visible.sync="openCustomer" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div class="formShow">
+          <div>
+          <el-form-item label="客户名称:">
+            <div>{{ formatCustomerName(form.customerId) }}</div>
+          </el-form-item>
+          <el-form-item label="投诉类型:">
+              <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="form.type" />
+          </el-form-item>
+          <el-form-item label="订单号:" prop="orderId" >
+            <div>{{form.orderId}}</div>
+          </el-form-item>
+          <el-form-item label="提单号:" prop="ladingbillId" >
+            <div>{{form.ladingbillId||'无'}}</div>
+          </el-form-item>
+          </div>
+          <div>
+            <el-form-item label="投诉时间:">
+                <span>{{parseTime(form.createTime)}}</span>
+            </el-form-item>
+            <el-form-item label="投诉状态:">
+               <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.type" />
+            </el-form-item>
+          </div>
+        </div>
+        <el-form-item label="投诉内容:" >
+          <div>{{form.content||'无'}}</div>
+          </el-form-item>
+        <el-form-item v-show="form.status == '2'||form.status == '3'" label="查明原因:" prop="ascertainReason" >
+          <div>{{form.ascertainReason||'无'}}</div>
+          </el-form-item>
+        <el-form-item v-show="form.status == '2'||form.status == '3'" label="处理方案:" prop="plan" >
+          <div>{{form.plan||'无'}}</div>
+          </el-form-item>
+        <el-form-item v-show="form.status == '3'" label="处理结果:" prop="result" >
+        <div>{{form.result||'无'}}</div>
+        </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="处理时间:">
+          <span>{{parseTime(form.handleAt)}}</span>
+        </el-form-item>
+      </el-form>
+
+      <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="openCustomer=false">确 定</el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog
       title="提示"
       :visible.sync="handle.dialogVisible"
@@ -246,6 +332,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openCustomer:false,
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
@@ -362,6 +449,17 @@ export default {
       // 新增客诉默认状态为待处理
       this.form.status = 1;
     },
+
+    /** 查看按钮操作 */
+    handleSee(row) {
+      this.reset();
+      const id = row.id;
+      getCustomerComplaint(id).then(response => {
+        this.form = response.data;
+        this.openCustomer = true;
+        this.title = "投诉详情";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -442,3 +540,11 @@ export default {
   }
 };
 </script>
+<style scoped>
+  .formShow{
+    display: flex;
+  }
+  .formShow div{
+    flex: 1;
+  }
+</style>

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

@@ -9,17 +9,17 @@
              <el-option :label="$t('处理时间')" value="2"/>
           </el-select>
           <el-date-picker clearable v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择开始日期')" />
-         <span>{{$t('到')}}</span>
+         <span style="margin: 0 8px;">{{$t('到')}}</span>
           <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('始发地:')">
             <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')">
-                <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+                <el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的地:')" >
             <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')">
-             <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id" ></el-option>
+             <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
             </el-select>
         </el-form-item>
         <el-form-item :label="$t('运输方式:')" >

src/views/ecw/order/prepayDeal.vue

@@ -131,12 +131,12 @@
           <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
                <el-form-item :label="$t('订单总金额:')">
-                  {{orderFee.totalAmount||0}}
+                  <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalAmountList">{{item}}{{key}}</span>
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
                <el-form-item :label="$t('应付预付金额:')">
-                  {{orderFee.totalPaymentAmount}}
+                  <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalPaymentAmount">{{item}}{{key}}</span>
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
@@ -186,7 +186,7 @@
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
-                <el-form-item :label="$t('*处理结果:')" >
+                <el-form-item :label="$t('处理结果:')" required>
                   <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择">
                   <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
                              :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -216,12 +216,12 @@
               </el-row>
               <el-row >
                  <el-form-item :label="$t('状态:')">
-                      <el-radio v-model="handlerParams.orderExceptionStatus" label="1">处理中</el-radio>
-                      <el-radio v-model="handlerParams.orderExceptionStatus" label="2">已处理</el-radio>
+                      <el-radio v-model="handlerParams.orderExceptionStatus" label="1">{{$t('处理中')}}</el-radio>
+                      <el-radio v-model="handlerParams.orderExceptionStatus" label="2">{{$t('已处理')}}</el-radio>
                  </el-form-item>
               </el-row>
               <el-row>
-                 <el-form-item :label="$t('*查明原因:')">
+                 <el-form-item :label="$t('查明原因:')" required>
                     <el-select v-model="handlerParams.orderExceptionHandlerResult">
                     <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
                                :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -356,6 +356,7 @@
       submitForm(){
           if(!this.handlerParams.orderExceptionHandlerResult){
             this.$modal.msgError(this.$t('请选择处理结果'));
+            return
           }
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));

src/views/ecw/order/special/light.vue

@@ -10,7 +10,7 @@
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item :label="$t('*现泡货申请标准:')" size="medium" label-width="150px">
+             <el-form-item :label="$t('现泡货申请标准:')" size="medium" label-width="150px" required>
                <el-input style="width: 100px;"  type="text" v-model="queryParams.vweight"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>

src/views/ecw/order/special/weight.vue

@@ -10,7 +10,7 @@
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item :label="$t('*现重货申请标准:')" size="medium" label-width="150px">
+             <el-form-item :label="$t('现重货申请标准:')" size="medium" label-width="150px" required>
                <el-input style="width: 100px;"  type="text" v-model="queryParams.wvolume"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>

src/views/ecw/order/splitApply.vue

@@ -133,7 +133,7 @@
           </div>
           <div>
              <el-button v-if="index==0" disabled type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
-               <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('移出')}}</el-button>
+               <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
               <el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
           </div>
         </div>
@@ -468,9 +468,11 @@ export default {
       let that = this
       if(!that.form.transportId){
         that.$message.error(this.$t("请选择运输方式"));
+        return
       }
       if(!that.form.destWarehouseId){
         that.$message.error(this.$t("请选择目的仓库"));
+        return
       }
       // if(!this.form.channelId){
       //   this.$modal.msgError("请选择出货渠道");

src/views/ecw/productBrank/BrandForm/index.vue

@@ -19,7 +19,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="`商标${index + 1}商品`">
-        <el-select v-model="form.productIds" :placeholder="`请选择商标{index + 1}商品`" multiple filterable @change="updateValue">
+        <el-select v-model="form.productIds" :placeholder="`请选择商标${index + 1}商品`" multiple filterable @change="updateValue">
           <el-option
             v-for="item in getProductListByTypeId(form.productTypeId)"
             :key="item.id"

src/views/ecw/productBrank/Empower/index.vue

@@ -127,11 +127,11 @@
     <el-dialog
       title="添加"
       :visible.sync="addDialog.dialogVisible"
-      width="500px">
+      width="600px">
       <el-form ref="form" :model="addDialog.form" label-width="80px">
         <el-form-item label="客户名称">{{ addDialog.form.customerName }}</el-form-item>
         <el-form-item label="授权时间">
-          <el-date-picker
+ <!--         <el-date-picker
             v-model="addDialog.dateRange"
             @chang="handleDatePick"
             type="daterange"
@@ -139,7 +139,10 @@
             value-format="timestamp"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
-          </el-date-picker>
+          </el-date-picker> -->
+        <el-date-picker clearable v-model="addDialog.form.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择开始日期')" />
+         <span style="margin: 0 8px;">到</span>
+          <el-date-picker clearable v-model="addDialog.form.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
         <el-form-item label="收费模式">
           <dict-selector v-model="addDialog.form.feeScale" :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL"></dict-selector>
@@ -247,7 +250,7 @@ export default {
           "customerContactsId": 0,
           "customerId": 0,
           "endTime": "",
-          "feeScale": 1,
+          "feeScale": 0,
           "fileUrl": "",
           "productBrandId": null,
           "startTime": "",