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

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){
+        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/ecw/order/warehousing/index.vue

@@ -196,8 +196,8 @@
       </div>
     </el-dialog>
     <el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol">
-      <el-form label-position="top" label-width="200">
-        <el-form-item :label="$t('原因类型')">
+      <el-form label-position="top" label-width="200" ref="exceptionForm" :model="form" :rules="exceptionRules">
+        <el-form-item :label="$t('原因类型')" prop="manualExceptionType">
           <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="$t('附件')">
@@ -208,7 +208,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="handleSubmit">{{$t('确认并完成入仓')}}</el-button>
+        <el-button  type="primary" @click="handleException">{{$t('确认并完成入仓')}}</el-button>
         <el-button @click="escapeBol = false">{{$t('取消')}}</el-button>
       </span>
     </el-dialog>
@@ -286,7 +286,7 @@ export default {
         orderLocationCreateReqVOList: [],
         exceptionUrls:[],
         descZh:'',
-        manualExceptionType:'',
+        manualExceptionType:[],
         urls: [],
         sumVolume: '',
         sumWeight: '',
@@ -309,6 +309,19 @@ export default {
             "start": 0
           }
         ]
+      },
+      exceptionRules: {
+        manualExceptionType: [
+          { required: true, message: '请勾选原因类型', trigger: 'change' },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length <= 0) {
+                callback(new Error('请勾选原因类型'))
+              }
+              callback()
+            }, trigger: 'change'
+          }
+        ]
       }
     }
   },
@@ -401,6 +414,15 @@ export default {
       })
       return result
     },
+    handleException() {
+      this.$refs.exceptionForm.validate((valid) => {
+        if (valid) {
+          this.handleSubmit()
+        } else {
+          this.$message.warning('请勾选原因类型')
+        }
+      })
+    },
     async handleSubmit() {
       if (this.specialHas0()) {
         const confirm = await this.$confirm(this.$t('有特需费用为0或未填写，请问是否继续？'), this.$t('注意'), {

src/views/system/version/index.vue

@@ -74,7 +74,7 @@
       </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"/>
 
     <!-- 对话框(添加 / 修改) -->
@@ -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();
     },
     /** 重置按钮操作 */