报价列表添加详情

src/api/ecw/customer.js

@@ -117,9 +117,11 @@ export function getPublicList(query) {
 }
 
 //捞取
-export function setFishing(query){
+export function setFishing(data){
   return request({
-    url:'',
+    url:'/ecw/customer/catch-open-sea-customer',
+    method:'put',
+    data:data
 
   })
 }

src/api/ecw/order.js

+import request from '@/utils/request'
+
+// 创建订单
+export function createOrder(data) {
+  return request({
+    url: '/ecw/order/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新订单
+export function updateOrder(data) {
+  return request({
+    url: '/ecw/order/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单
+export function deleteOrder(id) {
+  return request({
+    url: '/ecw/order/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得订单
+export function getOrder(id) {
+  return request({
+    url: '/ecw/order/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得订单分页
+export function getOrderPage(query) {
+  return request({
+    url: '/ecw/order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出订单 Excel
+export function exportOrderExcel(query) {
+  return request({
+    url: '/ecw/order/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -77,7 +77,7 @@ export const DICT_TYPE = {
   ECW_COUPON_COST_TYPE: 'coupon_cost_type', // 优惠券费用类型
   ECW_COUPON_OVERDUE_STATUS: 'coupon_overdue_status', // 优惠券状态
   ECW_COUPON_PUTON_STATUS: 'coupon_puton_status',
-  ECW_SUITABLE_USER_TYPE:'suitable_user_type', // 适用用户类型
+  ECW_SUITABLE_USER_TYPE: 'suitable_user_type', // 适用用户类型
   ECW_SUITABLE_LINE_TYPE: 'suitable_line_type', // 适用线路类型
   ECW_SUITABLE_PROD_TYPE: 'suitable_prod_type', // 适用产品类型
   ECW_ORDER_ATTR: 'order_attr', // 订单属性
@@ -117,18 +117,22 @@ export const DICT_TYPE = {
   IS_DEFAULT: 'is_default', // 默认联系人
   CUSTOMER_FOLLOW_TYPE: 'customer_follow_type', // 跟进类型
   CUSTOMER_FOLLOW_METHOD: 'customer_follow_method', //  跟进方式
-  COMMISSION_PRODUCT_APPROVAL:'commission_product_approval', //佣金备案
-  SHIPPING_DECLARATION_TYPE:'shipping_declaration_type',//出货报关方式（与订单报关方式相同）
-  COMMISSION_TYPE:'commission_type',//佣金类型
-  COMMISSION_DARK_TYPE :'commission_dark_type',//暗涌类型
-  COMMISSION_CURRENCY_TYPE:'commission_currency_type',//佣金货币类型
-  COMMISSION_UNIT:'commission_unit',//佣金货物单位
-  ECW_PORT_TYPE:'port_type',  //港口类型
-  CERTIFICATE_TYPE:'certificate_type',//证件类型
+  COMMISSION_PRODUCT_APPROVAL: 'commission_product_approval', //佣金备案
+  SHIPPING_DECLARATION_TYPE: 'shipping_declaration_type',//出货报关方式（与订单报关方式相同）
+  COMMISSION_TYPE: 'commission_type',//佣金类型
+  COMMISSION_DARK_TYPE: 'commission_dark_type',//暗涌类型
+  COMMISSION_CURRENCY_TYPE: 'commission_currency_type',//佣金货币类型
+  COMMISSION_UNIT: 'commission_unit',//佣金货物单位
+  ECW_PORT_TYPE: 'port_type',  //港口类型
+  CERTIFICATE_TYPE: 'certificate_type',//证件类型
   //customer
   CUSTOMER_CREDIT_RULE_TYPE: 'customer_credit_rule_type',
   CUSTOMER_LEVEL_RULE_TYPE: 'customer_level_rule_type',
-
+  // order
+  ORDER_TYPE: 'order_type', // 订单类型
+  PRODUCT_RECORD_ATTRIBUTE: 'product_record_attribute', //产品备案属性
+  CONTROL_GOODS_STATUS: 'control_goods_status', //控货状态
+  DISBURSEMENT_TYPE: 'disbursement_type' //垫付类型
 }
 
 /**

src/views/ecw/customerCommissionInfo/index.vue

@@ -67,7 +67,7 @@
         <el-col :span="24">
           <el-form-item label="佣金类型(明佣、暗佣)">
             <el-radio-group v-model="form.type">
-              <el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" :label="parseInt(item.value)"
+              <el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" v-show="item.value != 0" :label="parseInt(item.value)"
                         :key="index">{{ item.label }}
               </el-radio>
             </el-radio-group>
@@ -98,8 +98,8 @@
                                              :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
               </div>
               <div>
-                <custom-selectors-dictionary v-model="mingServantFrom[0].refundUnit"
-                                             :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                <custom-selectors-dictionary v-model="mingServantFrom[0].refundUnit" label-key="titleZh" value-key="id"
+                                             :options="weightList"></custom-selectors-dictionary>
               </div>
             </div>
           </div>
@@ -131,8 +131,8 @@
                                                  :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
                   </div>
                   <div class="custom">
-                    <custom-selectors-dictionary v-model="item.darkUnit"
-                                                 :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                    <custom-selectors-dictionary v-model="item.darkUnit" label-key="titleZh" value-key="id"
+                                                 :options="weightList"></custom-selectors-dictionary>
                   </div>
                 </div>
                 <div>
@@ -157,7 +157,7 @@
                 </div>
                 <div class="item">
                   <custom-selectors-dictionary v-model="item.amountUnit"
-                                               :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                                               label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary>
                 </div>
               </div>
               <div class="content">
@@ -171,7 +171,7 @@
                 </div>
                 <div class="item">
                   <custom-selectors-dictionary v-model="item.refundUnit"
-                                               :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                                               label-key="titleZh" value-key="id"     :options="weightList"></custom-selectors-dictionary>
                 </div>
               </div>
               <el-button type="primary" @click="addToFn(2)" v-show="darkServantAndRebateForm.length -1 === index">添加</el-button>
@@ -189,8 +189,8 @@
                                                :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
                 </div>
                 <div class="item">
-                  <custom-selectors-dictionary v-model="mingServantAnddarkServant[0].refundUnit"
-                                               :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                  <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="mingServantAnddarkServant[0].refundUnit"
+                                               :options="weightList"></custom-selectors-dictionary>
                 </div>
               </div>
             </div>
@@ -208,8 +208,8 @@
                                                :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
                 </div>
                 <div class="item">
-                  <custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustUnit"
-                                               :options="getDictDatas(DICT_TYPE.COMMISSION_UNIT)"></custom-selectors-dictionary>
+                  <custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustUnit" label-key="titleZh" value-key="id"
+                                               :options="weightList"></custom-selectors-dictionary>
                 </div>
               </div>
             </div>
@@ -240,6 +240,7 @@ import customSelectorsDictionary from "./customSelectorsDictionary"
 import {getTradeCityList} from "@/api/ecw/region";
 import RoutersSelector from "@/components/RoutersSelector"
 import CustomersSelector from "@/components/CustomersSelector";
+import {getUnitList} from "@/api/ecw/unit";
 
 export default {
   name: "CustomerCommissionInfo",
@@ -273,7 +274,7 @@ export default {
         {
           refund: 0,
           refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
-          refundUnit: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),
+          refundUnit:undefined,
         }
       ],
       //暗佣金+产品
@@ -283,7 +284,7 @@ export default {
           productAttr: undefined,//暗佣 产品属性
           darkCommission: 0,//暗佣 佣金
           darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
-          darkUnit:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//	暗佣 单位
+          darkUnit:undefined,//	暗佣 单位
         }
       ],
       //暗佣+达标返佣
@@ -291,10 +292,10 @@ export default {
         {
           amount: 0,//	暗佣-满减金额
           amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
-          amountUnit:parseInt (this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//	暗佣-满减金额对应单位,
+          amountUnit:undefined,//	暗佣-满减金额对应单位,
           refund: 0,//暗佣-满之后返还金额
           refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
-          refundUnit:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//暗佣-满之后返还金额的单位
+          refundUnit:undefined,//暗佣-满之后返还金额的单位
         }
       ],
       //暗佣+明金
@@ -302,10 +303,10 @@ export default {
         {
           refund: 0,//	暗佣+明佣 上调金额
           refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
-          refundUnit: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//暗佣+明佣 上调对应的单位
+          refundUnit: undefined,//暗佣+明佣 上调对应的单位
           darkAdjustCommission: 0,//暗佣+明佣 上调金额
           darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
-          darkAdjustUnit:parseInt( this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//暗佣+明佣 上调对应的单位
+          darkAdjustUnit:undefined,//暗佣+明佣 上调对应的单位
         }
       ],
       customerForm: {
@@ -327,6 +328,8 @@ export default {
       },
       customerShow: true,
       id:undefined,//佣金id
+      weightList:[]
+
     };
   },
   computed:{
@@ -338,6 +341,43 @@ export default {
     },
   },
   created() {
+    //重量单位
+    getUnitList().then(r =>{
+      if(r.code === 0){
+        this.weightList = r.data
+        this.$set(this.mingServantFrom,0, {
+            refund: 0,
+            refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
+            refundUnit: parseInt(this.weightList[0].id),})
+        this.$set(this.darkServantAndProductForm, 0,
+          {
+            productType: undefined,//商品类型
+            productAttr: undefined,//暗佣 产品属性
+            darkCommission: 0,//暗佣 佣金
+            darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
+            darkUnit: parseInt(this.weightList[0].id),//	暗佣 单位
+          })
+        this.$set(this.darkServantAndRebateForm, 0,
+          {
+            amount: 0,//	暗佣-满减金额
+            amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
+            amountUnit:parseInt (this.weightList[0].id),//	暗佣-满减金额对应单位,
+            refund: 0,//暗佣-满之后返还金额
+            refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
+            refundUnit:parseInt(this.weightList[0].id),//暗佣-满之后返还金额的单位
+          })
+        this.$set(this.mingServantAnddarkServant, 0,
+          {
+            refund: 0,//	暗佣+明佣 上调金额
+            refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
+            refundUnit: parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
+            darkAdjustCommission: 0,//暗佣+明佣 上调金额
+            darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
+            darkAdjustUnit:parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
+          })
+      }
+    })
+
     this.getCustomeList();
     if(this.$route.params.dictId != 0){
       commissionGetByCustomerId(this.$route.params.dictId).then(r => {
@@ -437,9 +477,9 @@ export default {
         this.darkServantAndRebateForm.push( {
           amount: 0,//	暗佣-满减金额
           amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
-          amountUnit: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[0].value),//	暗佣-满减金额对应单位,
+          amountUnit: parseInt(this.weightList[0].id),//	暗佣-满减金额对应单位,
           refund: 0,//暗佣-满之后返还金额
-          refundCurrency: parseInt (this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
+          refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
           refundUnit: this.darkServantAndRebateForm[0].refundUnit,//暗佣-满之后返还金额的单位
         })
       }
@@ -516,36 +556,36 @@ export default {
       deep:true,
     },
     'form.transportId':function (val){
-            if(!this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)) return
+            if(!this.weightList) return
             if((val == 1 || val == 2)){
-           let index =  this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT).findIndex(item => item.label == '立方米');
+           let index =  this.weightList.findIndex(item => item.id == 7);
               this.mingServantFrom.forEach(item =>{
-                item.refundUnit = parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit = parseInt(this.weightList[index].id);
               })
               this.mingServantAnddarkServant.forEach(item =>{
-                item.refundUnit =parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
-                item.darkAdjustUnit =parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit =parseInt(this.weightList[index].id);
+                item.darkAdjustUnit =parseInt(this.weightList[index].id);
               })
               this.darkServantAndRebateForm.forEach(item =>{
-                item.refundUnit = parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit = parseInt(this.weightList[index].id);
               })
               this.darkServantAndProductForm.forEach(item =>{
-                item.darkUnit = parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.darkUnit = parseInt(this.weightList[index].id);
               })
             }else {
-              let index =  this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT).findIndex(item => item.label == '千克');
+              let index =  this.weightList.findIndex(item => item.id == 6);
               this.mingServantFrom.forEach(item =>{
-                item.refundUnit =parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit =parseInt(this.weightList[index].id);
               })
               this.mingServantAnddarkServant.forEach(item =>{
-                item.refundUnit = parseInt( this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
-                item.darkAdjustUnit =parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit = parseInt( this.weightList[index].id);
+                item.darkAdjustUnit =parseInt(this.weightList[index].id);
               })
               this.darkServantAndRebateForm.forEach(item =>{
-                item.refundUnit =parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.refundUnit =parseInt(this.weightList[index].id);
               })
               this.darkServantAndProductForm.forEach(item =>{
-                item.darkUnit = parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_UNIT)[index].value);
+                item.darkUnit = parseInt(this.weightList[index].id);
               })
             }
 

src/views/ecw/oceanCustomer/index.vue

@@ -90,7 +90,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-folder-add" @click="distribution(scope.row)">移交</el-button>
-          <el-button size="mini" type="text" icon="el-icon-crop">捞取</el-button>
+          <el-button size="mini" type="text" icon="el-icon-crop" @click="fishingFn(scope.row)">捞取</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -120,7 +120,7 @@
 </template>
 
 <script>
-import { createCustomer, updateCustomer, deleteCustomer,handOverCustomer,getPublicList,exportCustomerExcel } from "@/api/ecw/customer";
+import { createCustomer, updateCustomer, deleteCustomer,handOverCustomer,getPublicList,exportCustomerExcel, setFishing } from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import upload from '@/components/ImageUpload'
 import {listServiceUser} from "@/api/system/user";
@@ -365,6 +365,28 @@ export default {
         }
       })
     },
+    fishingFn(row){
+      this.$confirm(`是否要捞取${row.name}的客户`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        setFishing({id:row.id}  ).then(r=>{
+          if(r.code === 0){
+            this.getList()
+            this.$message({
+              type: 'success',
+              message: '捞取成功!'
+            });
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消捞取'
+        });
+      });
+    }
   }
 };
 </script>

src/views/ecw/offer/components/special/index.vue

+<template>
+  <div>
+
+    <el-dialog
+      title="特价申请"
+      :visible.sync="dialogVisible"
+      width="900px"
+      :before-close="handleClose()">
+      <div>
+        订单号： {{ number }}
+      </div>
+      <el-table
+        :data="[]"
+        style="width: 100%">
+        <el-table-column
+          prop="address"
+          label="品名">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="填单货物属性">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="入库货物属性">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="最后操作时间">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="原价">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="成本价">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="销售价">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="操作">
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Special",
+  props: {
+    id: {
+      type: String
+    },
+    visible: {
+      tpe: Boolean,
+      default: false
+    },
+    number: {
+      tpe: String,
+      default: ''
+    }
+  },
+  mounted() {
+    this.dialogVisible = visible
+  },
+  data() {
+    return {
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose() {}
+  },
+  watch: {
+    visible(val) {
+      this.dialogVisible = val
+    },
+    dialogVisible(val) {
+      this.$emit('update:visible', this.dialogVisible, val)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/offer/index.vue

@@ -112,16 +112,22 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
+<<<<<<< HEAD
+=======
+    <special :visible.sync="special.visible" :id="special.offerId" :number="special.number"></special>
+>>>>>>> f341cddc22324f722bea133476ce40dd9aaddee3
 
   </div>
 </template>
 
 <script>
 import { createOffer, updateOffer, deleteOffer, getOffer, getOfferPage, exportOfferExcel } from "@/api/ecw/offer";
+import Special from "@/views/ecw/offer/components/special"
 
 export default {
   name: "Offer",
   components: {
+    Special
   },
   data() {
     return {
@@ -174,6 +180,13 @@ export default {
         estCost: null,
         sendstatus: null,
       },
+
+      special: {
+        visible: false,
+        offerId: undefined,
+        number: ''
+      }
+
     };
   },
   created() {
@@ -248,6 +261,11 @@ export default {
           this.$download.excel(response, '${table.classComment}.xls');
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    handleSpecial(row){
+      this.special.visible = true
+      this.special.offerId = row.offerId
+      this.special.number = row.number
     }
   }
 };

src/views/ecw/order/index.vue

+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+      <el-form-item label="订单编号" prop="orderNo">
+        <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+ 
+      <el-form-item label="产品备案属性" prop="productRecord">
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="控货状态" prop="cargoControlStatus">
+        <dict-selector :type="DICT_TYPE.CONTROL_GOODS_STATUS" v-model="queryParams.cargoControlStatus" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="报关类别" prop="customsType">
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:order:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['ecw:order:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键ID" align="center" prop="orderId" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" />
+      <el-table-column label="父编号" align="center" prop="parentNumber" />
+      <el-table-column label="下单会员" align="center" prop="userId" />
+      <el-table-column label="唛头" align="center" prop="marks" />
+ 
+      <el-table-column label="产品备案属性" align="center" prop="productRecord">
+        <template slot-scope="scope">
+          <span>{{ scope.row.productRecord | recordFilter(productRecordList) }}</span>
+        </template>
+      </el-table-column>
+
+       <el-table-column label="控货状态" align="center" prop="cargoControlStatus">
+        <template slot-scope="scope">
+          <span>{{ scope.row.cargoControlStatus | cargoControlStatusFilter(cargoControlStatusList) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="报关类别" align="center" prop="customsType">
+        <template slot-scope="scope">
+          <span>{{ scope.row.customsType | customsTypeFilter(customsTypeList) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="入仓箱数" align="center" prop="sumNum" />
+      <el-table-column label="入仓方数" align="center" prop="sumVolume" />
+      <el-table-column label="入仓重量" align="center" prop="sumWeight" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['ecw:order:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['ecw:order:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="唛头" prop="marks">
+          <el-input v-model="form.marks" placeholder="请输入唛头" />
+        </el-form-item>
+        <el-form-item label="产品备案属性" prop="productRecord">
+          <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="form.productRecord" clearable  />
+        </el-form-item>
+        <el-form-item label="控货状态" prop="cargoControlStatus">
+          <dict-selector :type="DICT_TYPE.CONTROL_GOODS_STATUS" v-model="form.cargoControlStatus" clearable />
+        </el-form-item>
+        <el-form-item label="报关类别" prop="customsType">
+          <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" clearable  />
+        </el-form-item>
+
+        <el-form-item label="入仓箱数" prop="sumNum">
+          <el-input v-model="form.sumNum" placeholder="请输入入仓箱数" />
+        </el-form-item>
+        <el-form-item label="入仓方数" prop="sumVolume">
+          <el-input v-model="form.sumVolume" placeholder="请输入入仓方数" />
+        </el-form-item>
+        <el-form-item label="入仓重量" prop="sumWeight">
+          <el-input v-model="form.sumWeight" placeholder="请输入入仓重量" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createOrder, updateOrder, deleteOrder, getOrder, getOrderPage, exportOrderExcel } from "@/api/ecw/order";
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+export default {
+  name: "Order",
+  components: {
+    
+  },
+  filters:{
+    cargoControlStatusFilter(e,cargoControlStatusList) {
+      if(e) return cargoControlStatusList.find(item=>item.value == e).label
+    },
+    recordFilter(e,productRecordList) {
+      if(e) return productRecordList.find(item=>item.value == e).label
+    },
+    customsTypeFilter(e,customsTypeList) {
+      if(e) return customsTypeList.find(item=>item.value == e).label
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeRucangtime: [],
+      dateRangeDaogangtime: [],
+      dateRangeQingguantime: [],
+      dateRangePreLoadTime: [],
+      dateRangeLoadTime: [],
+      dateRangeUnloadTime: [],
+      dateRangeTakeTime: [],
+      dateRangeSplitTime: [],
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        orderNo: null,
+        number: null,
+        tidanNo: null,
+        parentNumber: null,
+        oldNumbers: null,
+        transportId: null,
+        lineId: null,
+        channelId: null,
+        orderType: null,
+        userId: null,
+        marks: null,
+        productRecord: null,
+        isCargoControl: null,
+        cargoControlStatus: null,
+        customsType: null,
+        upFile: null,
+        payType: null,
+        status: null,
+        isDel: null,
+        collectionProxy: null,
+        isCollection: null,
+        zhongPao: null,
+        wVolume: null,
+        vWeight: null,
+        weightUnit: null,
+        warehouseType: null,
+        countryAbbreviation: null,
+        countryCode: null,
+        sendsms: null,
+        commissionId: null,
+        documentsFile: null,
+        remarks: null,
+        isTodoOrder: null,
+        advanceType: null,
+        transFee: null,
+        transCurrency: null,
+        plateFee: null,
+        boxFee: null,
+        todoDetail: null,
+        advanceWho: null,
+        toDepartureId: null,
+        sumNum: null,
+        sumVolume: null,
+        sumWeight: null,
+        weightRatio: null,
+        customerId: null,
+        wareId: null,
+        areaId: null,
+        locationId: null,
+        locationName: null,
+        sumValue: null,
+        valuationFee: null,
+        cost: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        orderNo: [{ required: true, message: "订单编号不能为空", trigger: "blur" }],
+        sumVolume: [{ required: true, message: "入仓方数不能为空", trigger: "blur" }],
+        sumWeight: [{ required: true, message: "入仓重量不能为空", trigger: "blur" }],
+        weightRatio: [{ required: true, message: "重货比不能为空", trigger: "blur" }],
+      },
+      productRecordList: getDictDatas(DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE),
+      cargoControlStatusList: getDictDatas(DICT_TYPE.CONTROL_GOODS_STATUS),
+      customsTypeList: getDictDatas(DICT_TYPE.ECW_CUSTOMS_TYPE)
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeRucangtime, 'rucangtime');
+      this.addBeginAndEndTime(params, this.dateRangeDaogangtime, 'daogangtime');
+      this.addBeginAndEndTime(params, this.dateRangeQingguantime, 'qingguantime');
+      this.addBeginAndEndTime(params, this.dateRangePreLoadTime, 'preLoadTime');
+      this.addBeginAndEndTime(params, this.dateRangeLoadTime, 'loadTime');
+      this.addBeginAndEndTime(params, this.dateRangeUnloadTime, 'unloadTime');
+      this.addBeginAndEndTime(params, this.dateRangeTakeTime, 'takeTime');
+      this.addBeginAndEndTime(params, this.dateRangeSplitTime, 'splitTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getOrderPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        orderId: undefined,
+        orderNo: undefined,
+        number: undefined,
+        tidanNo: undefined,
+        parentNumber: undefined,
+        oldNumbers: undefined,
+        transportId: undefined,
+        lineId: undefined,
+        channelId: undefined,
+        orderType: undefined,
+        userId: undefined,
+        marks: undefined,
+        productRecord: undefined,
+        isCargoControl: undefined,
+        cargoControlStatus: undefined,
+        customsType: undefined,
+        upFile: undefined,
+        payType: undefined,
+        status: undefined,
+        isDel: undefined,
+        collectionProxy: undefined,
+        isCollection: undefined,
+        zhongPao: undefined,
+        wVolume: undefined,
+        vWeight: undefined,
+        weightUnit: undefined,
+        warehouseType: undefined,
+        countryAbbreviation: undefined,
+        countryCode: undefined,
+        sendsms: undefined,
+        commissionId: undefined,
+        documentsFile: undefined,
+        remarks: undefined,
+        isTodoOrder: undefined,
+        advanceType: undefined,
+        transFee: undefined,
+        transCurrency: undefined,
+        plateFee: undefined,
+        boxFee: undefined,
+        todoDetail: undefined,
+        advanceWho: undefined,
+        toDepartureId: undefined,
+        sumNum: undefined,
+        sumVolume: undefined,
+        sumWeight: undefined,
+        weightRatio: undefined,
+        customerId: undefined,
+        wareId: undefined,
+        areaId: undefined,
+        locationId: undefined,
+        locationName: undefined,
+        sumValue: undefined,
+        valuationFee: undefined,
+        rucangtime: undefined,
+        daogangtime: undefined,
+        cost: undefined,
+        qingguantime: undefined,
+        preLoadTime: undefined,
+        loadTime: undefined,
+        unloadTime: undefined,
+        takeTime: undefined,
+        splitTime: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeRucangtime = [];
+      this.dateRangeDaogangtime = [];
+      this.dateRangeQingguantime = [];
+      this.dateRangePreLoadTime = [];
+      this.dateRangeLoadTime = [];
+      this.dateRangeUnloadTime = [];
+      this.dateRangeTakeTime = [];
+      this.dateRangeSplitTime = [];
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const orderId = row.orderId;
+      getOrder(orderId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.orderId != null) {
+          updateOrder(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createOrder(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orderId = row.orderId;
+      this.$modal.confirm('是否确认删除订单编号为"' + orderId + '"的数据项?').then(function() {
+          return deleteOrder(orderId);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeRucangtime, 'rucangtime');
+      this.addBeginAndEndTime(params, this.dateRangeDaogangtime, 'daogangtime');
+      this.addBeginAndEndTime(params, this.dateRangeQingguantime, 'qingguantime');
+      this.addBeginAndEndTime(params, this.dateRangePreLoadTime, 'preLoadTime');
+      this.addBeginAndEndTime(params, this.dateRangeLoadTime, 'loadTime');
+      this.addBeginAndEndTime(params, this.dateRangeUnloadTime, 'unloadTime');
+      this.addBeginAndEndTime(params, this.dateRangeTakeTime, 'takeTime');
+      this.addBeginAndEndTime(params, this.dateRangeSplitTime, 'splitTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有订单数据项?').then(() => {
+          this.exportLoading = true;
+          return exportOrderExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/ecw/zhongPao/index.vue

@@ -46,7 +46,7 @@
           <dict-tag :type="DICT_TYPE.ZHONG_PAO_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="传输方式" align="center" prop="transportTypes">
+      <el-table-column label="运输方式" align="center" prop="transportTypes">
         <template slot-scope="scope">
           <span v-for="item in scope.row.transportTypes.split(',')"><dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="item" />, </span>
         </template>
@@ -69,7 +69,7 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:zhong-pao:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-show="scope.row.departureId !== 0 || scope.row.objectiveIds !== '0'"
                      v-hasPermi="['ecw:zhong-pao:delete']">删除</el-button>
         </template>
       </el-table-column>
@@ -87,7 +87,7 @@
                        :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
-        <el-form-item label="传输方式" prop="transportTypes">
+        <el-form-item label="运输方式" prop="transportTypes">
           <dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" v-model="form.transportTypes" multiple form-type="checkbox" :filter="transportTypesFilter"></dict-selector>
         </el-form-item>
         <el-form-item label="始发地" prop="departureId">
@@ -285,6 +285,7 @@ export default {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
+            this.reset()
           });
           return;
         }
@@ -293,6 +294,7 @@ export default {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
+          this.reset()
         });
       });
     },

src/views/member/user/index.vue

@@ -504,6 +504,7 @@ export default {
             img2:this.IdDetails.img2,
             name:this.IdDetails.name,
             userCardAuthId:this.IdDetails.id,
+            auditPass:this.IdDetails.status === 3 ? true : false,
           } ;
           memberUserUpdateIdCard(p).then(r => {
             if(r.code === 0){
@@ -526,7 +527,8 @@ export default {
             img2:this.enterpriseFrom.img2,
             legalName:this.enterpriseFrom.legalName,
             name:this.enterpriseFrom.name,
-            userEnterpriseAuthId:this.enterpriseFrom.id
+            userEnterpriseAuthId:this.enterpriseFrom.id,
+            auditPass:this.enterpriseFrom.status === 3 ? true : false,
           }
           memberUserUpdateEnterprise(p).then(r =>{
             if(r.code === 0){