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

src/api/ecw/order.js

@@ -163,7 +163,7 @@ export function orderWarehouseIn(data){
   })
 }
 
-// 入仓
+// 入仓修改
 export function orderWarehouseInUpdateApply(data){
   return request({
     url: '/order/order-warehouse-in/update-apply',
@@ -171,6 +171,13 @@ export function orderWarehouseInUpdateApply(data){
     data
   })
 }
+// 获取入仓修改审批单详情-审批使用
+export function getWarehouseUpdateApprovalInfo(id) {
+  return request({
+    url: '/order/order-warehouse-in/get-update-approval-info?formId=' + id,
+    method: 'get'
+  })
+}
 
 // 入仓完成
 export function orderWarehouseInFinish(data){

src/views/bpm/processInstance/detail.vue

@@ -177,6 +177,11 @@ export default {
           processId: this.processInstance.businessKey,
           type: 1
         },
+        warehouse_update: {
+          component: "warehouseDetails",
+          processId: this.processInstance.businessKey,
+          type: 4
+        },
         container_modify: {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,

src/views/ecw/customer/query.vue

@@ -168,6 +168,34 @@
                    <dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="row.filing" />
                  </template>
                 </el-table-column>
+                <el-table-column label="授权开始">
+                  <template v-slot="{row}">
+                    {{parseTime(row.startTime)}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="授权结束">
+                  <template v-slot="{row}">
+                    {{parseTime(row.endTime)}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="授权证明">
+                  <template v-slot="{row}">
+                    <div v-if="!!row.fileUrl && row.fileUrl.length > 0">
+                  <span v-for="(item, index) in row.fileUrl.split(',')">
+                    <a :href="item" target="_blank">附件{{ index + 1 }}</a>,
+                  </span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="feeScale"
+                  :formatter="(row) => getDictDataLabel(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL, row.feeScale)"
+                  label="收费标准">
+                </el-table-column>
+                <el-table-column
+                  prop="createUsername"
+                  label="添加人">
+                </el-table-column>
                 <el-table-column label="创建时间">
                   <template v-slot="{row}">
                     {{parseTime(row.createTime)}}

src/views/ecw/customerCommissionInfo/index.vue

 <template>
   <div class="app-container">
-    <el-form :rules="rules" :model="form" ref="form" :inline="true" >
+    <el-form  class="demo-ruleForm" label-position="left" label-width="110px" :rules="rules" :model="form" ref="form" >
+      <el-card class="box-card" style="padding: 10px">
+        <div slot="header" class="clearfix">
           <el-row>
-        <el-col :span="24">
+            <el-col :span="5">
               <el-form-item label="客户名称" prop="customerId">
                 <el-select
                   v-model="customerForm.name"
@@ -20,27 +22,26 @@
                 </el-select>
               </el-form-item>
             </el-col>
-      </el-row>
-      <el-row>
             <el-col :span="5">
               <el-form-item label="运输方式" prop="transportId">
-            <div style="width: 130px;">
-              <custom-selectors-dictionary v-model="form.transportId"
-                                           :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
+                <div>
+                  <custom-selectors-dictionary v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
                 </div>
               </el-form-item>
             </el-col>
             <el-col :span="5">
               <el-form-item label="始发地" prop="departureId">
-            <div style="width: 130px;">
+                <div>
                   <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.departureId"
                                                :options="exportCityList"></custom-selectors-dictionary>
                 </div>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="5">
               <el-form-item label="目的地" prop="objectiveId">
-            <div style="width: 130px;">
+                <div>
                   <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.objectiveId"
                                                :options="importCityList"></custom-selectors-dictionary>
                 </div>
@@ -48,24 +49,25 @@
             </el-col>
             <el-col :span="5">
               <el-form-item label="报关方式" prop="customsType">
-            <div style="width: 130px;">
+                <div>
                   <custom-selectors-dictionary v-model="form.customsType"
                                                :options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary>
                 </div>
               </el-form-item>
             </el-col>
-        <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="备案" prop="approval">
-            <div style="width: 130px;">
+                <div>
                   <custom-selectors-dictionary v-model="form.approval"
                                                :options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary>
                 </div>
               </el-form-item>
             </el-col>
           </el-row>
+        </div>
         <el-row>
           <el-col :span="24">
-          <el-form-item label="佣金类型(明佣、暗佣)">
+            <el-form-item label-width="150px" label="佣金类型(明佣、暗佣)">
               <el-radio-group v-model="form.type">
                 <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 }}
@@ -195,7 +197,7 @@
                 </div>
               </div>
               <div class="title">
-              <span class="label">成本价：</span>原价-暗佣佣金
+                <span class="label">成本价 = 原价-暗佣佣金</span>
               </div>
               <div class="box">
                 <div class="label">销售价上调：</div>
@@ -214,7 +216,7 @@
                 </div>
               </div>
               <div class="title">
-              <span class="label"> 实际佣金返点：</span>销售价-成本价
+                <span class="label"> 实际佣金返点 = 销售价-成本价</span>
               </div>
             </div>
           </el-col>
@@ -225,6 +227,7 @@
             <el-button style="width:200px" @click="cancel">取消</el-button>
           </el-col>
         </el-row>
+      </el-card>
     </el-form>
   </div>
 </template>
@@ -320,11 +323,6 @@ export default {
       // 表单校验
       rules: {
         customerId: [{required: true, message: "客户名称不能为空", trigger: "blur"}],
-        departureId: [{required: true, message: "始发地不能为空", trigger: "blur"}],
-        transportId: [{required: true, message: "运输方式不能为空", trigger: "blur"}],
-        objectiveId: [{required: true, message: "目的地不能为空", trigger: "blur"}],
-        customsType: [{required: true, message: "报关类别不能为空", trigger: "blur"}],
-        approval: [{required: true, message: "产品备案不能为空", trigger: "blur"}],
       },
       customerShow: true,
       id:undefined,//佣金id
@@ -618,11 +616,11 @@ export default {
   }
 
   .title {
-    margin: 15px 0;
-
+    margin: 25px 0;
+    text-align: left;
     .label {
       vertical-align: middle;
-      font-size: 14px;
+      font-size: 16px;
       color: #606266;
       font-weight: 700;
     }

src/views/ecw/order/associatedOrder.vue

@@ -57,7 +57,11 @@
          <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
        </template>
      </el-table-column>
-     <el-table-column label="操作人"></el-table-column>
+     <el-table-column label="操作人" prop="creator">
+       <template v-slot="{row}">
+         {{userList.find( i => row.creator == i.id).nickname}}
+       </template>
+     </el-table-column>
      <el-table-column label="操作时间">
        <template v-slot="{row}">
          {{parseTime(row.createTime)}}
@@ -85,6 +89,7 @@ import {
 } from "@/api/ecw/associatedOrder";
 import {getDictDatas,DICT_TYPE} from '@/utils/dict'
 import Template from "@/views/cms/template";
+import {listSimpleUsers} from "@/api/system/user";
 export default {
   name: "associatedOrder",
   props:{
@@ -114,7 +119,8 @@ export default {
       list:[],
       DICT_TYPE,
       getDictDatas,
-      multipleSelection:[]
+      multipleSelection:[],
+      userList:[]
     }
   },
   created() {
@@ -125,13 +131,13 @@ export default {
         this.orderDetails = r.data;
       }
     })
+    listSimpleUsers().then(r => this.userList = r.data)
   },
   methods:{
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
           this.list = r.data
-         console.log( this.list[0])
         }
       })
     },

src/views/ecw/order/components/warehouseDetails.vue

@@ -124,6 +124,12 @@
       {{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
     </div>
   </div>
+  <div v-if="type === 4">
+    <p>申请理由</p>
+    <div>
+      {{ FeeDetails.details || '' }}
+    </div>
+  </div>
 </div>
 </template>
 
@@ -133,7 +139,13 @@ import {
   warehouseApprovalGetById,
   warehouseAreaPositionList
 } from "@/api/ecw/batchSingleApplication";
-import {applicationGetOrderByProcessId, feeApplicationGet, getOrder, getOrderPage,} from "@/api/ecw/order";
+import {
+  applicationGetOrderByProcessId,
+  feeApplicationGet,
+  getOrder,
+  getOrderPage,
+  getWarehouseUpdateApprovalInfo
+} from '@/api/ecw/order'
 import { getChannelList } from '@/api/ecw/channel';
 import Template from "@/views/cms/template";
 import {getSupplierPage} from "@/api/ecw/supplier";
@@ -221,6 +233,12 @@ export default {
             })
           });
           break;
+        case 4:
+          // 入仓修改
+          getWarehouseUpdateApprovalInfo(this.processInstanceID).then(r => {
+            this.FeeDetails.details = r.data.details
+          })
+          break
       }
     }
 

src/views/ecw/order/mutexOrder.vue

@@ -57,7 +57,11 @@
           <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作人"></el-table-column>
+      <el-table-column label="操作人">
+        <template v-slot="{row}">
+          {{userList.find( i => row.creator == i.id).nickname}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作时间" prop="createTime">
         <template v-slot="{row}">{{
             parseTime(row.orderBackVO.createTime)
@@ -85,6 +89,7 @@ import {
 } from "@/api/ecw/mutexOrder";
 import {getDictDatas,DICT_TYPE} from '@/utils/dict'
 import Template from "@/views/cms/template";
+import {listSimpleUsers} from "@/api/system/user";
 export default {
   name: "mutexOrder",
   props:{
@@ -104,7 +109,8 @@ export default {
       list:[],
       DICT_TYPE,
       getDictDatas,
-      multipleSelection:[]
+      multipleSelection:[],
+      userList:[]
     }
   },
   created() {
@@ -115,6 +121,7 @@ export default {
         this.orderDetails = r.data;
       }
     })
+    listSimpleUsers().then(r => this.userList = r.data)
   },
   methods:{
     getList(){

src/views/ecw/order/transferWarehousing.vue

@@ -8,8 +8,8 @@
     <el-divider content-position="left">
       货物信息
     </el-divider>
-    <el-table :data=" orderDetails.orderItemVOList &&  orderDetails.orderItemVOList.length > 0  ? orderDetails.orderItemVOList : [] ">
-      <el-table-column type="index" label="序号"></el-table-column>
+    <el-table :show-summary="true" :summary-method="totalFn" :data=" orderDetails.orderItemVOList &&  orderDetails.orderItemVOList.length > 0  ? orderDetails.orderItemVOList : [] ">
+      <el-table-column width="80" type="index" label="序号"></el-table-column>
       <el-table-column label="品名">
         <template v-slot="{row}">
           <div>{{ row.prodTitleZh }}</div>
@@ -18,22 +18,21 @@
       </el-table-column>
       <el-table-column label="填单货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="1">
+          <el-descriptions size="mini" :column="2">
             <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
             <el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{ row.volume }}</el-descriptions-item>
-            <el-descriptions-item label="重量">
-            </el-descriptions-item>
+            <el-descriptions-item label="体积">{{ row.volume }}m³</el-descriptions-item>
+            <el-descriptions-item label="重量">{{row.weight}}Kg</el-descriptions-item>
           </el-descriptions>
         </template>
       </el-table-column>
       <el-table-column label="入库货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="4">
+          <el-descriptions size="mini" :column="2">
             <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
             <el-descriptions-item label="箱数"> {{  row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum :'' }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{  row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}</el-descriptions-item>
-            <el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}</el-descriptions-item>
+            <el-descriptions-item label="体积">{{  row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}m³</el-descriptions-item>
+            <el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}Kg</el-descriptions-item>
           </el-descriptions>
         </template>
       </el-table-column>
@@ -238,6 +237,22 @@ export default {
             this.$router.back();
           }
       })
+    },
+    totalFn({ columns, data }){
+      //  体积，数量，重量 W:入仓
+      let volume = 0,num = 0,weight = 0;
+      let Wvolume = 0 ,Wnum = 0,Wweight = 0;
+       data.forEach(i => {
+         volume += Number(i.volume)
+         num += Number(i.num)
+         weight += Number(i.weight)
+         Wvolume += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.volume : 0);
+         Wnum += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.num : 0)
+         Wweight += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.weight : 0)
+       })
+      let text = `下单统计：${num}箱 ${volume}m³ ${weight}Kg`
+      let text2 =` 入仓统计：${Wnum}箱 ${Wvolume}m³ ${Wweight}Kg`
+      return ['合计：',text,text2]
     }
   },
 }