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

src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue

@@ -22,7 +22,7 @@
 
     <!-- 开始装柜 -->
     <el-dialog title="开始装柜" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
-      <startPacking v-bind="$attrs" v-if="dialogVisible" @closeDialog="closeDialog" />
+      <startPacking v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" />
     </el-dialog>
 
     <!-- 操作 -->
@@ -99,7 +99,7 @@ export default {
         }
       });
     },
-    closeDialog(type) {
+    closeDialog1(type) {
       this.dialogVisible = false;
       if (type) this.cancel(type);
     },

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -38,7 +38,7 @@
           {{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
         </el-descriptions-item>
         <el-descriptions-item label="发货电话">
-          {{orderData.consignorVO?(orderData.consignorVO.phone?(orderData.consignorVO.countryCode+orderData.consignorVO.phone):'无'):'无'}}
+          {{orderData.consignorVO?(orderData.consignorVO.phone?("+"+orderData.consignorVO.countryCode+orderData.consignorVO.phone):'无'):'无'}}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions :column="4">
@@ -49,7 +49,7 @@
           {{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
         </el-descriptions-item>
         <el-descriptions-item label="收货电话">
-          {{orderData.consigneeVO?orderData.consigneeVO.phone?orderData.consigneeVO.countryCode+orderData.consigneeVO.phone :'无':'无'}}
+          {{orderData.consigneeVO?orderData.consigneeVO.phone?"+"+orderData.consigneeVO.countryCode+orderData.consigneeVO.phone :'无':'无'}}
         </el-descriptions-item>
       </el-descriptions>
     </el-card>
@@ -117,7 +117,7 @@
             </p>
           </div>
           <div>
-            <el-button type="primary" @click="addShop">放入</el-button>
+            <el-button type="primary" :disabled="isAudit" @click="addShop">放入</el-button>
           </div>
         </div>
         <el-table border :data="splitData.orderSplitItemBackVOList">
@@ -157,7 +157,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">移出</el-button>
+              <el-button size="mini" :disabled="isAudit" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -168,12 +168,12 @@
       <work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
     </el-row>
 
-    <div slot="footer" class="card footer_btn" v-if="orderData.status!=99">
-      <el-button v-if="orderData.status!=19" type="primary" @click="submitForm">提交申请</el-button>
-      <el-button v-if="orderData.status!=19" plain type="primary" @click="$emit('closeDialog')">取消</el-button>
-      <el-button v-if="orderData.status==19" type="primary">审核中</el-button>
-      <el-button v-if="orderData.status==19" plain type="primary" @click="cancelSplit">取消审核</el-button>
-      <el-button v-if="orderData.status==19" plain type="primary" @click="$emit('closeDialog')">返回</el-button>
+    <div slot="footer" class="card footer_btn">
+      <el-button v-if="!isAudit" type="primary" @click="submitForm">提交申请</el-button>
+      <el-button v-if="!isAudit" plain type="primary" @click="$emit('closeDialog2')">取消</el-button>
+      <el-button v-if="isAudit" type="primary" @click="jumpReviewDetail">审核中</el-button>
+      <el-button v-if="isAudit" plain type="primary" @click="cancelSplit">取消审核</el-button>
+      <el-button v-if="isAudit" plain type="primary" @click="$emit('closeDialog2')">返回</el-button>
     </div>
 
     <!-- 对话框(添加 / 修改) -->
@@ -215,15 +215,14 @@
 import {
   getSplitList,
   createSplit,
-  cancelApply,
   createSplitItem,
   deleteSplitItem,
 } from "@/api/ecw/orderHandle";
 import { getTradeCityList } from "@/api/ecw/region";
 import WorkFlow from "@/components/WorkFlow";
 import { getOrder } from "@/api/ecw/order";
-import { serviceMsg } from "../../utils";
-import { createApproval } from "@/api/ecw/boxSea";
+import { serviceMsg, toReviewDetail } from "../../utils";
+import { createApproval, approvalCancel } from "@/api/ecw/boxSea";
 
 export default {
   name: "splitOrder",
@@ -288,6 +287,23 @@ export default {
       },
     },
   },
+  computed: {
+    isAudit() {
+      const { shipmentObj } = this.$attrs;
+      const { cabinetSplitInfo } = shipmentObj;
+      if (cabinetSplitInfo) {
+        /**
+         * PROCESS(1, "处理中"),
+         * APPROVE(2, "通过"),
+         * REJECT(3, "不通过"),
+         * CANCEL(4, "已取消");
+         */
+        const { approvalStatus } = cabinetSplitInfo;
+        if (approvalStatus === 1) return true;
+      }
+      return false;
+    },
+  },
   methods: {
     /* 拆箱总数 */
     totalSplitNum() {
@@ -405,6 +421,7 @@ export default {
         shipmentId: shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then((res) => {
+          this.$emit("getBoxInfo");
           this.getSplit();
         });
       });
@@ -469,11 +486,12 @@ export default {
       const { shipmentObj } = this.$attrs;
       approvalCancel({
         applyReason: "取消审核",
-        id: shipmentObj["cabinetApprovalInfo"].id,
+        id: shipmentObj["cabinetSplitInfo"].id,
         shipmentId: shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.$emit("closeDialog");
+          this.$emit("getBoxInfo");
+          this.getSplit();
         });
       });
     },
@@ -481,6 +499,11 @@ export default {
       this.shopOpen = false;
       this.shopForm = {};
     },
+    jumpReviewDetail() {
+      const { cabinetSplitInfo } = this.$attrs.shipmentObj;
+      toReviewDetail.apply(this, [cabinetSplitInfo.bpmProcessId]);
+      this.$emit("closeDialog2", "close");
+    },
   },
 };
 </script>

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -119,7 +119,7 @@
       <div v-if="isUnderReview">
         <el-button type="primary" @click="jumpReviewDetail">封柜审核中</el-button>
         <el-button plain type="primary" @click="canclAudit">取消审核</el-button>
-        <el-button plain type="primary" @click="$emit('closeDialog')">返回</el-button>
+        <el-button plain type="primary" @click="$emit('closeDialog1')">返回</el-button>
       </div>
     </el-row>
 
@@ -154,7 +154,7 @@
         </el-form>
         <el-row class="operate-button">
           <el-button type="primary" @click="onSubmit('modifyForm')">下一步</el-button>
-          <el-button @click="closeDialog">取消</el-button>
+          <el-button @click="closeDialog2">取消</el-button>
         </el-row>
       </template>
       <!-- 装柜纠错 -->
@@ -166,7 +166,7 @@
         </el-form>
         <el-row class="operate-button">
           <el-button type="primary" @click="onSubmit('correctionForm')">提交</el-button>
-          <el-button @click="closeDialog">取消</el-button>
+          <el-button @click="closeDialog2">取消</el-button>
         </el-row>
       </template>
       <!-- 批量装柜纠错（订单号） -->
@@ -178,7 +178,7 @@
         </el-form>
         <el-row class="operate-button">
           <el-button type="primary" @click="onSubmit('orderForm')">提交</el-button>
-          <el-button @click="closeDialog">取消</el-button>
+          <el-button @click="closeDialog2">取消</el-button>
         </el-row>
       </template>
       <!-- 装柜批量输入 -->
@@ -190,11 +190,11 @@
         </el-form>
         <el-row class="operate-button">
           <el-button type="primary" @click="onSubmit('batchForm')">提交</el-button>
-          <el-button @click="closeDialog">取消</el-button>
+          <el-button @click="closeDialog2">取消</el-button>
         </el-row>
       </template>
       <!-- 拆单 -->
-      <splitOrder v-bind="$attrs" :shipmentObj="shipmentObj" v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog="closeDialog" />
+      <splitOrder v-bind="$attrs" v-on="$listeners" :shipmentObj="shipmentObj" v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog2="closeDialog2" />
     </el-dialog>
   </div>
 </template>
@@ -372,7 +372,7 @@ export default {
       this.$set(this.dialogConfig, "dialogVisible", true);
     },
     /** 关闭弹窗 */
-    closeDialog() {
+    closeDialog2() {
       this.$set(this.dialogConfig, "dialogVisible", false);
     },
     /** 修改提交 */
@@ -428,7 +428,7 @@ export default {
         params.orderNo = this.batchObj.qrCode;
         batchCreate(params).then((res) => {
           serviceMsg(res, this).then(() => {
-            this.closeDialog();
+            this.closeDialog2();
             this.getLoadSecGoodsList();
           });
         });
@@ -445,14 +445,14 @@ export default {
       if (type === "single") {
         singleDelete(params).then((res) => {
           serviceMsg(res, this).then(() => {
-            this.closeDialog();
+            this.closeDialog2();
             this.getLoadSecGoodsList();
           });
         });
       } else {
         batchDelete(params).then((res) => {
           serviceMsg(res, this).then(() => {
-            this.closeDialog();
+            this.closeDialog2();
             this.getLoadSecGoodsList();
           });
         });
@@ -479,12 +479,12 @@ export default {
       };
       boxUpdate(params).then((res) => {
         serviceMsg(res, this);
-        this.closeDialog();
+        this.closeDialog2();
       });
     },
     /* 补单完成 */
     supplementFinish() {
-      this.closeDialog();
+      this.closeDialog2();
       this.getLoadSecGoodsList();
     },
     /* 申请封柜 */
@@ -497,7 +497,7 @@ export default {
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.$emit("closeDialog", "submit");
+          this.$emit("closeDialog1", "submit");
         });
       });
     },
@@ -516,14 +516,14 @@ export default {
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.$emit("closeDialog", "submit");
+          this.$emit("closeDialog1", "submit");
         });
       });
     },
     jumpReviewDetail() {
       const { cabinetApprovalInfo } = this.shipmentObj;
       toReviewDetail.apply(this, [cabinetApprovalInfo.bpmProcessId]);
-      this.$emit("closeDialog", "close");
+      this.$emit("closeDialog1", "close");
     },
   },
   computed: {

src/views/ecw/busiPwd/index.vue

@@ -72,7 +72,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="密码" prop="pwd">
-          <el-input v-model="form.pwd" placeholder="请输入密码" type="password"/>
+          <el-input v-model="pwd1" placeholder="请输入密码" type="password"/>
         </el-form-item>
         <el-form-item label="确认密码" prop="pwd">
           <el-input v-model="pwd2" placeholder="请再次输入密码" type="password"/>
@@ -121,6 +121,7 @@ export default {
       // 表单参数
       form: {},
       pwd2:null,
+      pwd1:null,
       // 表单校验
       rules: {
       }
@@ -191,12 +192,13 @@ export default {
         if (!valid) {
           return;
         }
-        if(this.pwd2!==this.form.pwd){
+        if(this.pwd2!==this.pwd1){
           this.$modal.alertError("两次密码输入不一致");
           return;
         }
         // 修改的提交
         if (this.form.id != null) {
+          this.form.pwd = this.pwd1;
           updateBusiPwd(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;

src/views/ecw/customer/transferCustomer.vue

 <template>
   <el-dialog
     center
-    title="客服"
+    :title="$t('客服')"
     :visible.sync="show"
     width="30%">
     <div style="width: 100%;min-height: 200px;text-align: center">
@@ -10,8 +10,8 @@
       </el-select>
     </div>
     <span slot="footer" class="dialog-footer">
-    <el-button @click="$emit('update:show',false)" >取 消</el-button>
-    <el-button type="primary" @click="submit">确 定</el-button>
+    <el-button @click="$emit('update:show',false)" >{{$t('取 消')}}</el-button>
+    <el-button type="primary" @click="submit">{{$t('确 定')}}</el-button>
   </span>
   </el-dialog>
 </template>
@@ -50,7 +50,7 @@ export default {
   methods:{
     submit(){
       if(!this.service){
-        return this.$message.warning('请选择客户经理！');
+        return this.$message.warning(this.$t('请选择客户经理！'));
       }
       handOverCustomer({
         customerServiceId:this.service,
@@ -59,7 +59,7 @@ export default {
         if(r.code === 0){
            this.$emit('update:show',false)
            this.$emit('update:customerIds',[])
-           this.$message.success('用户批量转移成功！')
+           this.$message.success(this.$t('用户批量转移成功！'))
         }
       })
     },

src/views/ecw/financial/creatCollection.vue

@@ -84,7 +84,6 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="remark"
-              :rules="{ required: true, trigger: ['blur', 'change'], message: '备注不能为空' }"
             >
               <el-input v-model="form.remark" placeholder="备注"></el-input>
             </el-form-item>
@@ -136,7 +135,9 @@
           </el-table-column>
           <el-table-column label="优惠金额" align="center">
             <template slot-scope="scope">
-              {{ scope.row.discountTotal ? `${scope.row.discountTotal}(${scope.row.discountRemark})` : 0 }}
+             <span> {{ scope.row.discountTotal ? `${scope.row.discountTotal}`:0}}</span>
+              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{scope.row.discountRemark?('('+scope.row.discountRemark+')'): '' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
@@ -608,10 +609,10 @@
           {{ selectListRow.totalAmount - (discountForm.discountTotal || 0) }}
           <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
         </el-form-item>
-        <el-form-item label="操作人">
+        <el-form-item v-if="opnotice" label="操作人">
           {{ discountForm.author }}
         </el-form-item>
-        <el-form-item label="操作时间">
+        <el-form-item v-if="opnotice" label="操作时间">
           {{ discountForm.time }}
         </el-form-item>
       </el-form>
@@ -657,6 +658,7 @@ export default {
       list: [],
       // fileList: [],
       orderData: [],
+      opnotice:false,
       dialogTableKey: 0,
       total: 0,
       headers: {
@@ -1022,12 +1024,23 @@ export default {
           this.$set(this.discountForm, 'discountTotal', res.data.discountTotal)
           this.$set(this.discountForm, 'discountRemark', res.data.discountRemark)
           this.$set(this.discountForm, 'author', res.data.creatorName)
+          this.opnotice = true
+        }else{
+          this.opnotice = false
         }
       })
     },
     saveDiscount() {
       console.log(this.discountForm)
       // this.selectListRow.id
+      if (this.discountForm.discountTotal === 0||!this.discountForm.discountTotal) {
+        this.$modal.msgError("优惠金额不能为空");
+        return
+      }
+      if (this.discountForm.discountRemark === 0||!this.discountForm.discountRemark) {
+        this.$modal.msgError("优惠原因不能为空");
+        return
+      }
       const params = {
         id: this.selectListRow.id,
         discountTotal: this.discountForm.discountTotal,
@@ -1075,7 +1088,8 @@ export default {
       this.open = false;
     },
     submitForm(addType) {
-      const params = {...this.form, addType}
+      const params = {...this.form}
+      params.addType = addType
       params.receiptAccountList.length = params.receiptAccountList.length - 1
       params.receiptAccountList.map(v => {
         delete v.discountTotal

src/views/ecw/financial/creatPayment.vue

@@ -107,7 +107,7 @@
                 <el-option
                   v-for="item in bankData"
                   :key="item.id"
-                  :label="item.baAccountName + '(' + item.baAccountNum + ')'"
+                  :label="item.bankName + '(' + item.bankNameAccount+ ')'"
                   :value="item.id"
                 />
               </el-select>
@@ -414,7 +414,6 @@ import { DICT_TYPE } from "@/utils/dict";
 import { getToken } from "@/utils/auth";
 import { getChannelList } from "@/api/ecw/channel";
 import CustomerSelector from "@/components/CustomerSelector";
-import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getTradeCityList } from "@/api/ecw/region";
 import { getSupplierPage } from "@/api/ecw/supplier";
@@ -482,9 +481,9 @@ export default {
     listSimpleUsers().then((res) => (that.creatorData = res.data));
     getChannelList().then((res) => (that.channelList = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));
-    getBankAccountPage(that.params).then(
-      (res) => (that.bankData = res.data.list)
-    );
+    // getBankAccountPage(that.params).then(
+    //   (res) => (that.bankData = res.data.list)
+    // );
     getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
       const { data } = res;
       this.allSupplier = data.list;
@@ -595,7 +594,9 @@ export default {
     },
     selectChange(val) {
       const t = this.allSupplier.find(v => v.id == val)
+      
       t && (this.form.supplierName = t.companyZh)
+      t && (this.bankData = t.bankList)
     },
     handleQuery() {},
     handleSelectionChange(val) {

src/views/ecw/order/index.vue

@@ -348,7 +348,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
       @pagination="getList" />
 
-    <special-needs :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs>
+    <special-needs :orderNo="orderNo" :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs>
     <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
@@ -453,6 +453,7 @@ export default {
       multipleSelection:[],
 
       transportId: null, // 指定运输方式
+      orderNo:''
     };
   },
   computed: {

src/views/ecw/order/weightDeal.vue

@@ -76,21 +76,21 @@
               <template slot-scope="scope">
                  <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
                  <p>
-                  <span>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
-                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
-                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
+                  <span>{{$t('品牌')}}：{{getBrand(scope.row.brand)}}&nbsp;&nbsp;</span>
+                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>
+                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</span>
                   <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
                 </p>
               </template>
          </el-table-column>
         <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span>
+            <span>{{scope.row.wvolume||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('泡货方数')" align="center" v-else >
           <template slot-scope="scope">
-            <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span>
+            <span>{{scope.row.vweight||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
@@ -111,6 +111,7 @@
 import {getExceptionById,handlerExceptionByExceptionId} from "@/api/ecw/orderException"
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
+import {getProductBrankPage} from '@/api/ecw/productBrank'
 
 export default {
   name: "WeightDeal",
@@ -124,7 +125,8 @@ export default {
       orderData:{},
       list: {},
       orderId:0,
-      type:''
+      type:'',
+      branklist:[]
     };
   },
   created() {
@@ -135,6 +137,9 @@ export default {
     if(this.$route.query.type){
       this.type = this.$route.query.type
     }
+    getProductBrankPage({pageNo:1,pageSize:500}).then((data)=>{
+      this.branklist=data.data.list
+    })
   },
   methods: {
     /** 查询列表 */
@@ -147,6 +152,10 @@ export default {
         this.getOrders()
       });
     },
+    getBrand(id){
+      var brank = this.branklist.find(item=>item.id==id)
+      return brank.titleZh||''
+    },
     checkCode(data){
       if(data.indexOf('+')==-1){
       	return '+'+data