Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/financial/creatPayment.vue

@@ -736,7 +736,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/paymentVoucher.vue

@@ -330,7 +330,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/receivable.vue

@@ -319,7 +319,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/voucher.vue

@@ -384,7 +384,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

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

@@ -4,7 +4,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-form-item >
-          <el-select v-model="queryParams.dateType" style="width: 172px;">
+          <el-select v-model="queryParams.dateType" style="width: 172px;" clearable>
              <el-option :label="$t('入仓时间')" value="1"/>
              <el-option :label="$t('处理时间')" value="2"/>
           </el-select>
@@ -13,28 +13,28 @@
           <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-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')" clearable>
                 <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-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')" clearable>
              <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('运输方式:')" >
-            <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number"/>
+            <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :clearable="true" v-model="queryParams.transportId" />
         </el-form-item>
       </el-row>
       <el-row>
         <el-form-item :label="$t('控货:')">
-             <dict-selector :type="DICT_TYPE.ECW_YESNO" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
+             <dict-selector :type="DICT_TYPE.ECW_YESNO" :clearable="true" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('异常状态:')">
-             <dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
+             <dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :clearable="true" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('异常类型:')">
-            <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
+            <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" :clearable="true" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('订单号:')">
           <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
@@ -42,21 +42,21 @@
       </el-row>
       <el-row>
         <el-form-item :label="$t('发货人:')">
-            <customer-selector v-model="queryParams.consignor" @change="consignor = $event" />
+            <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
         </el-form-item>
         <el-form-item :label="$t('唛头:')">
           <el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('品名:')">
-          <product-selector v-model="queryParams.goodsName" @keyup.enter.native="handleQuery" />
+          <product-selector v-model="queryParams.goodsName" :clearable="true" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('备案:')">
-             <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
+             <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :clearable="true" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
         </el-form-item>
       </el-row>
       <el-row>
         <el-form-item :label="$t('跟进业务:')">
-         <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')">
+         <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')" clearable>
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>
         </el-form-item>
@@ -98,8 +98,8 @@
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
-            <span v-else>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
           </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center">
@@ -145,7 +145,8 @@
 import {getOrderExceptionPage} from "@/api/ecw/orderException"
 import {getTradeCityList} from '@/api/ecw/region'
 import {DICT_TYPE} from  '@/utils/dict'
-import { userList } from "@/api/system/user"
+// import { userList } from "@/api/system/user"
+import {listServiceUser} from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
 
@@ -177,7 +178,10 @@ export default {
   created() {
     this.getList();
     getTradeCityList().then(res => this.tradeCityList = res.data)
-    userList('salesman').then(res =>this.creatorData = res.data)
+    listServiceUser().then(r => {
+      this.creatorData = r.data
+    })
+    // userList('salesman').then(res =>this.creatorData = res.data)
   },
   computed:{
     expoerCityList(){
@@ -199,6 +203,7 @@ export default {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
+        this.reset()
       });
     },
     /** 表单重置 */
@@ -207,14 +212,12 @@ export default {
         page: 1,
         rows: 10,
       };
-      this.resetForm("queryForm");
     },
     importCityName(id){
         return this.tradeCityList.filter(item => item.id == id)
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.page = 1;
       this.getList();
     },
     handEdit(id){