Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/order.js

@@ -377,6 +377,24 @@ export function getOrderSpecialByApproveId(approveId) {
   })
 }
 
+// 订单号检索功能
+export function getOrderNoSearch(params) {
+  return request({
+    url: '/ecw/order/orderNoSearch',
+    method: 'get',
+    params
+  })
+}
+
+// 提单号检索功能
+export function getBillNoSearch(params) {
+  return request({
+    url: '/ecw/order/billNoSearch',
+    method: 'get',
+    params
+  })
+}
+
 // 根据合并订单编号获得已合单的订单动态
 export function getMergeLogByMergedOrderNo(params){
   return request({

src/api/ecw/zhongPao.js

@@ -34,6 +34,15 @@ export function getZhongPao(id) {
   })
 }
 
+// 获得客户最优惠的重泡货配置
+export function getZhongPaoBest(query) {
+  return request({
+    url: '/ecw/zhong-pao/get-customer-best-zhong-pao',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得重泡货配置分页
 export function getZhongPaoPage(query) {
   return request({

src/layout/components/Navbar.vue

@@ -8,7 +8,7 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <el-badge :value="matterNum !== 0 ? matterNum : '' " class="right-menu-item badge">
-         <div @click="$router.push('/bpm/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
+         <div @click="$router.push('/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
         </el-badge>
 
         <el-badge :value="notMessage !== 0 ? notMessage : '' " class="right-menu-item badge">
@@ -216,7 +216,7 @@ export default {
       font-size: 18px;
       color: #5a5e66;
       vertical-align: text-bottom;
-      margin-right: 6px;
+      margin-right: 15px;
       &.hover-effect {
         cursor: pointer;
         transition: background .3s;

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -71,8 +71,8 @@
 
     </el-form>
     <el-row class="operate-button" v-if="inReview">
-      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? '部分退场审核中' : '全部退场审核中'}}</el-button>
-      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? '取消部分退场审核' : '取消全部退场审核'}}</el-button>
+      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? '全部退场审核中' : '部分退场审核中'}}</el-button>
+      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? '取消全部退场审核' : '取消部分退场审核'}}</el-button>
     </el-row>
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">保存</el-button>

src/views/ecw/customerComplaint/index.vue

@@ -112,10 +112,38 @@
           </el-select>
         </el-form-item>
         <el-form-item label="订单号" prop="orderId">
-          <el-input v-model="form.orderId" placeholder="请输入订单号" />
+          <el-select
+            v-model="form.orderId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入订单号"
+            :remote-method="getOrderList"
+            :loading="loading">
+            <el-option
+              v-for="item in orderList"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="提单号" prop="ladingbillId">
-          <el-input v-model="form.ladingbillId" placeholder="请输入提单号" />
+          <el-select
+            v-model="form.ladingbillId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入提单号"
+            :remote-method="getBillList"
+            :loading="loading">
+            <el-option
+              v-for="item in billList"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="投诉内容" prop="content">
           <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
@@ -169,7 +197,7 @@
           </el-input>
         </el-form-item>
         <el-form-item v-show="form.status == '3'" label="处理时间" required>
-          <el-date-picker type="datetime" v-model="form.handleAt"></el-date-picker>
+          <el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -186,6 +214,7 @@ import {getCustomerSelect} from '@/api/ecw/customer'
 import CustomerFollow from "../../../components/CustomerFollow"
 import DictSelector from '@/components/DictSelector'
 import { DICT_TYPE, getDictDataLabel, getDictDatas } from '@/utils/dict'
+import { getBillNoSearch, getOrderNoSearch } from '@/api/ecw/order'
 
 export default {
   name: "CustomerComplaint",
@@ -248,7 +277,10 @@ export default {
       // 处理
       handle: {
         dialogVisible: false
-      }
+      },
+
+      billList: [],
+      orderList: []
     };
   },
   created() {
@@ -259,6 +291,22 @@ export default {
     })
   },
   methods: {
+
+    getBillList(key){
+      getBillNoSearch({key, pageNo: 1, pageSize: 20}).then(r => {
+        if (r.code === 0){
+          this.billList = r.data.list
+        }
+      })
+    },
+
+    getOrderList(key){
+      getOrderNoSearch({key, pageNo: 1, pageSize: 20}).then(r => {
+        if (r.code === 0){
+          this.orderList = r.data.list
+        }
+      })
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/order/transferWarehousing.vue

@@ -129,7 +129,7 @@
         <el-form-item label="原因类型">
           <dict-selector v-model="params.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item required label="附件">
           <image-upload v-model="params.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item label="详细信息">
@@ -137,7 +137,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="submit2(false)">转异完成并入仓</el-button>
+        <el-button  type="primary" @click="submit2(false)">确认并完成入仓</el-button>
         <el-button @click="escapeBol = false">取消</el-button>
       </span>
     </el-dialog>

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

@@ -131,7 +131,7 @@
         <el-form-item label="原因类型">
           <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item required label="附件">
           <image-upload v-model="form.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item label="详细信息">
@@ -139,7 +139,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="handleSubmit">转异完成并入仓</el-button>
+        <el-button  type="primary" @click="handleSubmit">确认并完成入仓</el-button>
         <el-button @click="escapeBol = false">取消</el-button>
       </span>
     </el-dialog>

src/views/system/menu/index.vue

@@ -78,11 +78,16 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="form.type == 2">
+          <el-col :span="12" v-if="form.type == 2">
             <el-form-item label="显示菜单" prop="isShowInMenuBar">
               <dict-selector v-model="form.isShowInMenuBar" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" />
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.type == 2">
+            <el-form-item label="保活" prop="keepalive">
+              <dict-selector v-model="form.keepalive" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item v-if="form.type != '3'" label="菜单图标">
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
@@ -259,6 +264,7 @@ export default {
         isShowInMenuBar: undefined,
         type: SystemMenuTypeEnum.DIR,
         sort: undefined,
+        keepalive: false,
         status: CommonStatusEnum.ENABLE
       };
       this.resetForm("form");