backup

src/api/ecw/offer.js

@@ -52,3 +52,12 @@ export function exportOfferExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 更新报价单结果
+export function updateOfferResult(data) {
+  return request({
+    url: '/ecw/offer/update/result',
+    method: 'put',
+    data: data
+  })
+}
\ No newline at end of file

src/api/ecw/region.js

@@ -93,7 +93,7 @@ export function getCityList(query) {
 // 获得进出口城市
 export function getTradeCityList(query) {
   return request({
-    url: '/ecw/region/getCityList',
+    url: '/ecw/region/getTradeCityList',
     method: 'get',
     params: query
   })

src/api/member/user.js

@@ -52,3 +52,28 @@ export function exportUserExcel(query) {
     responseType: 'blob'
   })
 }
+//操作日志
+export  function operationLogApi(query){
+  return request({
+   url:'/member/user/operation-log/page',
+    method:'get',
+    params:query,
+  })
+}
+//更新证书
+ export function seTupdateBackletter(data){
+ return request({
+   url:'/member/user/update-backletter',
+   method:'put',
+   data:data
+
+ })
+}
+//获取指定用户的实名认证信息
+export function memberGetAuthIdcardInfo(query){
+  return request({
+    url:'/member/user/get-auth-idcard-info',
+    method:'get',
+    params:query,
+  })
+}

src/utils/dict.js

@@ -89,6 +89,8 @@ export const DICT_TYPE = {
   ECW_PACKAGE_TYPE: 'packageType', // 包装单位
   ECW_DOUBLE_CLEAR: 'double_clear', // 是否双清
   ECW_TRADE_TYPE: 'trade_type', // 交货放肆
+  ECW_OFFER_RESULT: 'offer_result', //  报单结果 赢单 输单
+  ECW_WAREHOUSING_TYPE: 'warehousing_type', //  入仓类型
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/offer/result.vue

+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+      <el-form-item label="报价单号" prop="offerId">
+        <div>{{form.offerId}}</div>
+      </el-form-item>
+
+      <el-form-item label="结果" prop="result">
+        <dict-selector form-type="radio" :type="DICT_TYPE.ECW_OFFER_RESULT" v-model="form.result" />
+      </el-form-item>
+
+      <template v-if="form.result==1">
+        <el-form-item label="入仓类型" prop="warehousingType">
+          <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehousingType" />
+        </el-form-item>
+        <el-form-item label="关联订单" prop="orderIds">
+          <el-input v-model="form.orderIds" style="width: 206px;"></el-input>
+        </el-form-item>
+      </template>
+      <template v-else>
+        <el-form-item label="原因" prop="reason">
+          <el-input style="width: 500px;" type="textarea" placeholder="" v-model="form.reason"></el-input>
+        </el-form-item>
+      </template>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">{{form.result==1?"确定并新增草稿订单":"提交"}}</el-button>
+        <el-button @click="$router.back()">返 回</el-button>
+        <el-button type="default" @click="reset">重 置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { updateOfferResult } from '@/api/ecw/offer';
+
+import CustomersSelector from '@/components/CustomersSelector'
+import RoutersSelector from '@/components/RoutersSelector'
+import ProductsSelector from '@/components/ProductsSelector'
+import Editor from '@/components/Editor'
+import Selector from '@/components/Selector/index'
+export default {
+  name: "AttrEdit",
+  components: { CustomersSelector, RoutersSelector, ProductsSelector, Editor, Selector },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {
+        "offerId": undefined,
+        "orderIds": undefined,
+        "reason": undefined,
+        "result": 1,
+        "warehousingType": undefined
+      },
+      // 表单校验
+      rules: {}
+    };
+  },
+  computed: {
+
+  },
+  watch: {
+
+  },
+  created() {
+    this.reset()
+  },
+  methods: {
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        "offerId": undefined,
+        "orderIds": undefined,
+        "reason": undefined,
+        "result": 1,
+        "warehousingType": undefined
+      };
+      this.resetForm("form");
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        let data = Object.assign({}, this.form)
+        updateOfferResult(data).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.$router.back();
+        });
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file

src/views/ecw/productPrice/edit.vue

@@ -302,7 +302,7 @@ export default {
                 }
                 // 添加的提交
                 data.productId = this.product.id;
-                data.lineChannelList = this.lineChannelList
+                data.lineChannelList = this.selectedRoutes
                 createProductPrice(data).then(response => {
                     this.$modal.msgSuccess("请求成功");
                     this.$router.replace('/product/product-price')

src/views/ecw/zhongPao/index.vue

@@ -9,12 +9,12 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="始发地ID" prop="departureId">
-        <el-input v-model="queryParams.departureId" placeholder="请输入始发地ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="目的地ID列表" prop="objectiveIds">
-        <el-input v-model="queryParams.objectiveIds" placeholder="请输入目的地ID列表" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+<!--      <el-form-item label="始发地ID" prop="departureId">-->
+<!--        <el-input v-model="queryParams.departureId" placeholder="请输入始发地ID" clearable @keyup.enter.native="handleQuery"/>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="目的地ID列表" prop="objectiveIds">-->
+<!--        <el-input v-model="queryParams.objectiveIds" placeholder="请输入目的地ID列表" clearable @keyup.enter.native="handleQuery"/>-->
+<!--      </el-form-item>-->
       <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -40,25 +40,31 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
+      <el-table-column label="序号" type="index" width="50px" />
       <el-table-column label="重泡货类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.ZHONG_PAO_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="临介值" align="center" prop="edge" />
-      <el-table-column label="公式" align="center" prop="formulas" />
-      <el-table-column label="传输方式ids" 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>
       </el-table-column>
-      <el-table-column label="始发地ID" align="center" prop="departureId" :formatter="departureFormatter"/>
-      <el-table-column label="目的地ID列表" align="center" prop="objectiveIds" :formatter="objectiveFormatter"/>
+      <el-table-column label="始发地" align="center" prop="departureId" :formatter="departureFormatter"/>
+      <el-table-column label="目的地" align="center" prop="objectiveIds" :formatter="objectiveFormatter"/>
+      <el-table-column label="临介值标准" align="center" prop="edge" />
+      <el-table-column label="计算公式" align="center" prop="formulas" />
       <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" prop="transportTypes">
+        <template v-slot="scope">
+          <el-switch v-model="scope.row.status" @change="handleStatusChange(scope.row)" :active-value="0" :inactive-value="1"></el-switch>
+        </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)"
@@ -84,13 +90,13 @@
         <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="始发地ID" prop="departureId">
+        <el-form-item label="始发地" prop="departureId">
           <el-select v-model="form.departureId" placeholder="请选择始发地">
             <el-option label="全部" :value="0"></el-option>
             <el-option v-for="(item) in warehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="目的地ID列表" prop="objectiveIds">
+        <el-form-item label="目的地" prop="objectiveIds">
 <!--          <el-input v-model="form.objectiveIds" placeholder="请输入目的地ID列表" />-->
           <el-select v-model="form.objectiveIds" placeholder="请选择目的地" multiple>
             <el-option label="全部" value="0"></el-option>
@@ -124,6 +130,7 @@ import {parseTime} from "@/utils/ruoyi"
 import DictSelector from "@/components/DictSelector"
 import {getTradeCityList} from "@/api/ecw/region"
 import {getWarehouseList} from "@/api/ecw/warehouse"
+import { CommonStatusEnum } from '@/utils/constants'
 
 export default {
   name: "ZhongPao",
@@ -177,6 +184,20 @@ export default {
     })
   },
   methods: {
+    handleStatusChange(row){
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal.confirm('确认要' + text + '吗?').then(function() {
+        return updateZhongPao({
+          id: row.id,
+          status: row.status
+        })
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
+    },
     departureFormatter(row, column, cellValue) {
       if (cellValue === 0) return '全部'
       return this.warehouseList.find(e => e.id === cellValue)?.titleZh

src/views/system/helpDoc/index.vue

@@ -79,10 +79,10 @@
           <el-input v-model="form.titleEn" placeholder="请输入标题英文" />
         </el-form-item>
         <el-form-item label="内容中文" prop="contentZh">
-          <editor v-model="form.contentZh" :min-height="192"/>
+          <editor  v-model="form.contentZh" :min-height="192"/>
         </el-form-item>
         <el-form-item label="内容英语" prop="contentEn">
-          <editor v-model="form.contentZh" :min-height="192"/>
+          <editor  v-model="form.contentEn" :min-height="192"/>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">