Merge remote-tracking branch 'origin/dev1.6' into dev

.env.dev

@@ -5,7 +5,7 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统 - 测试版
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

.env.development

@@ -6,7 +6,7 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
 
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.sit

@@ -2,7 +2,7 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 捷道管理系统 - 测试版
+VUE_APP_TITLE = 捷道管理系统 - 开发板
 
 # 捷道管理系统/开发环境
 VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'

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

@@ -38,7 +38,7 @@
 
       <el-row>
         <el-col :span="12">
-          <el-form-item :label="$t('预计提单补料时间')">
+          <el-form-item :label="$t('截补料时间')">
             <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.ladingBillTime"></el-date-picker>
           </el-form-item>
         </el-col>
@@ -51,7 +51,7 @@
 
       <el-row>
         <el-col :span="12">
-          <el-form-item :label="$t('预计报关时间')">
+          <el-form-item :label="$t('VGM提交时间')">
             <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.customsTime"></el-date-picker>
           </el-form-item>
         </el-col>
@@ -64,7 +64,7 @@
 
       <el-row>
         <el-col :span="12">
-          <el-form-item :label="$t('预计截关时间')">
+          <el-form-item :label="$t('截关时间')">
             <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="bookingObj.cutOffTime"></el-date-picker>
           </el-form-item>
         </el-col>

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

@@ -491,6 +491,10 @@ export default {
         this.total = data.dataList?.total ?? 0;
         this.unloadStatistics = data.unloadStatistics ?? {};
         this.toBePreLoading = false;
+        if(this.toBePreList.length == 0&&this.total!=0){
+          --this.pageParam.pageNo
+          this.getPreLoad()
+        }
       });
     },
     /** 搜索按钮操作 */
@@ -695,7 +699,6 @@ export default {
     },
     /* 查询所有数据 */
     queryAllData() {
-      this.pageParam.pageNo = 1;
       this.getSecGoods();
       this.getPreLoad();
     },

src/views/ecw/cabinet/index.vue

@@ -50,6 +50,13 @@
           {{ scope.row.weight }} Kg
         </template>
       </el-table-column>
+
+      <el-table-column label="提单补料(CBM)" align="center" prop="ladingBill">
+        <template slot-scope="scope">
+          {{ scope.row.ladingBill }} CBM
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('是否启用')" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -75,16 +82,20 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('柜型名称')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('请输入柜型名称')" />
         </el-form-item>
         <el-form-item label="体积(m³)" prop="volume">
-          <el-input v-model="form.volume" :placeholder="$t('请输入体积')" />
+          <el-input v-model.trim="form.volume"  @input="limitInput($event,'volume')"  :placeholder="$t('请输入体积')" />
         </el-form-item>
         <el-form-item label="重量(Kg)" prop="weight">
-          <el-input v-model="form.weight" :placeholder="$t('请输入重量')" />
+          <el-input v-model.trim="form.weight" @input="limitInput($event,'weight')"  :placeholder="$t('请输入重量')" />
+        </el-form-item>
+        <el-form-item label="提单补料(CBM)" prop="ladingBill">
+          <el-input v-model.trim="form.ladingBill" @input="limitInput($event,'ladingBill')"  :placeholder="$t('请输入提单补料')" />
         </el-form-item>
+
         <el-form-item :label="$t('是否启用')" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
@@ -135,7 +146,11 @@ export default {
         status: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        volume: 0,
+        weight: 0,
+        ladingBill:0
+      },
       // 表单校验
       rules: {
         name: [{ required: true, message: this.$t("柜型名称不能为空"), trigger: "blur" }],
@@ -171,8 +186,9 @@ export default {
       this.form = {
         id: undefined,
         name: undefined,
-        volume: undefined,
-        weight: undefined,
+        volume: 0,
+        weight: 0,
+        ladingBill:0,
         status: undefined,
         sort: undefined,
       };
@@ -253,6 +269,25 @@ export default {
           this.$download.excel(response, '机柜配置.xls');
           this.exportLoading = false;
         }).catch(() => {});
+    },
+
+    limitInput(value, name) {
+      let val = (value && value.split("")) || [];
+      let reg1 = /\d/;
+      let reg2 = /\./;
+      // 第一个字符不能为小数点
+      if (val[0] == ".") {
+        this.form[name] = "";
+        return;
+      }
+      // 过滤掉除数字和小数点外的字符
+      val = val.filter((e) => reg1.test(e) || reg2.test(e));
+      // 匹配小数点后只能有两位小数
+      // 解释一下这个match正则规格
+      // ^\d* 是指以数字开头，后面允许输入0到多位数字
+      // (\.?) 是指只允许一个小数点
+      // \d{0,2} 是指只允许0到2位小数
+      this.form[name] = val.join("").match(/^\d*(\.?\d{0,2})/g)[0] || null;
     }
   }
 };

src/views/ecw/financial/creatCollection.vue

@@ -658,7 +658,7 @@ import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getChannelList } from "@/api/ecw/channel";
 import { getTradeCityList } from "@/api/ecw/region";
-import { createReceipt, getReceivableList, getReceivableInfoByIds, getReceiptInfoByIds, getReceiptAccountList, getInvoicingItem, updateReceipt, updateReceivableDiscountById, getReceivableDiscountLogById } from "@/api/ecw/financial";
+import { createReceipt,getFirstReceivableListByOrderId, getReceivableList, getReceivableInfoByIds, getReceiptInfoByIds, getReceiptAccountList, getInvoicingItem, updateReceipt, updateReceivableDiscountById, getReceivableDiscountLogById } from "@/api/ecw/financial";
 import {getCustomer} from '@/api/ecw/customer'
 import NP from 'number-precision'
   import {getOrder} from '@/api/ecw/order'
@@ -729,6 +729,15 @@ export default {
     await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     getWarehouseList().then(res => this.warehouseList = res.data)
     let that = this;
+    if (that.$route.query.orderId) {
+      await getFirstReceivableListByOrderId({id:that.$route.query.orderId}).then(response => {
+        this.list = [...response.data]
+        getOrder(that.$route.query.orderId).then(response => {
+          // console.log(response.data)
+          if(response.data.customerId) this.$set(this.form,'customerId',response.data.customerId)
+        })
+    })
+    }
     if (that.$route.query.id) {
       this.flag = true
       this.id = this.$route.query.id;

src/views/ecw/order/index.vue

@@ -98,6 +98,15 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item :label="$t('异常状态')" prop="status">
+        <dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" v-model="queryParams.abnormalState"
+          @keyup.enter.native="handleQuery" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('审核状态')" prop="status">
+        <dict-selector :type="DICT_TYPE.AUDIT_STATUS" v-model="queryParams.auditResult"
+          @keyup.enter.native="handleQuery" clearable />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -220,7 +229,7 @@
 
                 <!-- 费用申请 -->
                 <template v-if="
-                  exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204,205,206])
+                  exclude(scope.row.status, [0, 88]) && exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId"  >{{$t('费用申请')}}</el-dropdown-item>
                 </template>
@@ -239,7 +248,7 @@
                 <!-- 特价 -->
                 <template v-if="
                   exclude(scope.row.status, [0]) &&
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
+                  // exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
                   exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item>