报价列表添加详情

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/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/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){