Merge remote-tracking branch 'origin/predev' into predev

src/views/ecw/order/cargoControl.vue

@@ -26,11 +26,12 @@
       <el-form-item :label="$t('品名')" prop="prodId">
         <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" clearable  @change="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('控货')" prop="isCargoControl">
-        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable  @change="handleQuery"/>
+      <el-form-item :label="$t('控货状态')" prop="isCargoControl">
+        <dict-selector v-model="queryParams.cargoControlStatus" :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status" clearable  @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
+          @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
@@ -89,9 +90,9 @@
       <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
         <template slot-scope="{row}">{{row.releaseNum}}</template>
       </el-table-column>
-      <el-table-column :label="$t('订单状态')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />
+      <el-table-column :label="$t('订单状态')" align="left" prop="status">
+        <template slot-scope="{row}">
+          {{row.statusMsg}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('提单号')" align="center" prop="status">
@@ -260,7 +261,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
-      this.getList();
+      this.$nextTick(this.getList)
     },
     /** 重置按钮操作 */
     resetQuery() {

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

@@ -60,7 +60,7 @@
             <template v-else>
               {{$t('运费')}}：{{ row.originalCostSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
               <br>
-              {{$t('清关费')}}：{{ row.originalClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+              {{$t('清关费')}}：{{ row.originalCostClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
             </template>
           </template>
         </el-table-column>
@@ -74,7 +74,7 @@
             <template v-else>
               {{$t('运费')}}：{{ row.costSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
               <br>
-              {{$t('清关费')}}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+              {{$t('清关费')}}：{{ row.costClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
             </template>
           </template>
         </el-table-column>

src/views/ecw/order/transferWarehousing.vue

@@ -141,11 +141,11 @@
     </div>
     <warehouse-location ref="area" :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="Number(this.type) === 1 ? warehouseDetails.warehouseOutId  : warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
     <el-dialog :title="$t('订单转异')" center :visible.sync="escapeBol">
-      <el-form label-position="top" label-width="200">
-        <el-form-item :label="$t('原因类型')">
+      <el-form ref="form2" :model="params" label-position="top" label-width="200">
+        <el-form-item prop="manualExceptionType"  :rules="{ required:true,message:'至少选择一个转异原因'}" :label="$t('原因类型')">
           <dict-selector v-model="params.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item required :label="$t('附件')">
+        <el-form-item  :label="$t('附件')">
           <image-upload v-model="params.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item :label="$t('详细信息')">
@@ -241,6 +241,7 @@ export default {
       }
       },
     toWarehouseAbnormal(){
+     let exceptionUrls =  this.params.exceptionUrls
       return {
         arrivalDate: this.params.arrivalDate,
         arrivalRemark: this.params.deliveryRemark,
@@ -249,8 +250,7 @@ export default {
         manualExceptionType:this.params.manualExceptionType.join(','),
         orderLocationCreateReqVOList: this.params.orderLocationCreateReqVOList,
         urls: this.params.urls,
-        exceptionUrls:this.params.exceptionUrls.split(','),
-
+        exceptionUrls:exceptionUrls.length ? exceptionUrls.split(',') :[],
       }
     },
     toWarehouse(){
@@ -345,12 +345,17 @@ export default {
       )
     },
     submit2(val){
-      warehouseAdjustArrived(val ? this.toWarehouse : this.toWarehouseAbnormal).then(r => {
-          if(r.code === 0){
-            this.$message.success(this.$t('调拨到仓成功！'));
-            this.$tab.closeOpenPage({path:'/order/order'})
+        this.$refs.form2.validate( validate => {
+          if(validate){
+            warehouseAdjustArrived(val ? this.toWarehouse : this.toWarehouseAbnormal).then(r => {
+              if(r.code === 0){
+                this.$message.success(this.$t('调拨到仓成功！'));
+                this.$tab.closeOpenPage({path:'/order/order'})
+              }
+            })
           }
-      })
+
+        })
     },
     totalFn({ columns, data }){
       //  体积，数量，重量 W:入仓

src/views/system/version/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      
+
       <el-form-item :label="$t('系统类型')" prop="appType">
         <el-select v-model="queryParams.appType" :placeholder="$t('请选择系统类型')" clearable="">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.ECW_DATA_SOURCE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
@@ -13,13 +13,13 @@
       <el-form-item :label="$t('强制更新')">
         <el-select v-model="queryParams.forceUpdate" :placeholder="$t('请选择更新条件')" clearable="">
           <el-option v-for="item in forceUpdateArray" :key="item.type" :label="$l(item, 'value')" :value="item.type"></el-option>
-        </el-select>  
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('内部版本')" prop="versionCode">
         <el-input v-model.number="queryParams.versionCode" :placeholder="$t('请输入内部版本')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      
-    
+
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -45,7 +45,7 @@
       <el-table-column label="系统类型" align="center" prop="appType">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_DATA_SOURCE" :value="row.appType" />
-        </template>  
+        </template>
       </el-table-column>
       <el-table-column label="版本号" align="center" prop="appVersion">
         <template slot-scope="scope">
@@ -74,13 +74,13 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
     <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-item :label="$t('系统')" prop="appType">
           <el-select v-model="form.appType" :placeholder="$t('请选择系统类型')">
             <el-option v-for="type in this.getDictDatas(DICT_TYPE.ECW_DATA_SOURCE)" :key="type.value" :label="type.label" :value="type.value" />
@@ -101,14 +101,14 @@
         </el-form-item>
 
         <el-form-item v-if="linkType==2">
-          <el-upload 
+          <el-upload
           ref="upload"
           :limit="1"
-          :headers="upload.headers" 
-          :action="upload.url" 
+          :headers="upload.headers"
+          :action="upload.url"
           :data="upload.data"
           :disabled="upload.isUploading"
-          :show-file-list="true" 
+          :show-file-list="true"
           :on-change="handleFileChange"
           :on-progress="uploadProcess"
           :on-success="handleFileSuccess"
@@ -116,7 +116,7 @@
             <el-button size="small">{{ $t('上传') }}<i class="el-icon-upload el-icon--right"></i>
             </el-button>
           </el-upload>
-         
+
         </el-form-item>
 
         <el-form-item :label="$t('版本链接')" prop="appUrl">
@@ -126,7 +126,7 @@
         <el-form-item :label="$t('强制更新')" prop="forceUpdate">
           <el-select v-model="form.forceUpdate" :placeholder="$t('请选择更新条件')">
             <el-option v-for="item in forceUpdateArray" :key="item.type" :label="$l(item, 'value')" :value="item.type"></el-option>
-          </el-select>  
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('说明')" prop="desp">
           <el-input type="textarea"  v-model="form.desp" :placeholder="$t('请输入说明')" />
@@ -177,8 +177,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         appUrl: null,
         appType: null,
         appVersion: null,
@@ -260,7 +260,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */