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

src/components/WarehouseAreaSelect/index.vue

@@ -4,7 +4,7 @@
     <el-button v-show="!readonly" type="primary" size="mini" @click="handleOpen">选择</el-button>
 
     <el-dialog
-      title="提示"
+      title="储位"
       :visible.sync="dialogVisible"
       width="30%"
       append-to-body

src/views/ecw/customer/edit.vue

@@ -693,11 +693,7 @@ export default {
 
   methods: {
     deleteBankData(index){
-      if(this.form.customerBanks.length === 1){
-        this.$message.warning('至少添加一条银行卡号信息');
-      }else {
       this.form.customerBanks.splice(index, 1);
-      }
     },
     //添加银行卡
     addBankData(){
@@ -903,7 +899,6 @@ export default {
       };
       this.form.createTime = (new Date()).getTime()
       this.resetForm("form");
-      this.addBankData()
     },
     getCustomer(id) {
       return getCustomer(id).then(response => {

src/views/ecw/financial/commission-requestFunds.vue

@@ -16,7 +16,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="customerId"
-              :rules="{ required: true, trigger: ['blur', 'change'] }"
+              :rules="{ required: true, trigger: ['blur', 'change'],message:$t('客户不能为空')}"
               :error="$t('客户不能为空')"
             >
                <customer-selector v-model="form.customerId" @change="consignor = $event" />
@@ -42,7 +42,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="departmentId"
-              required
+              :rules="{required:true,message:$t('部门不能为空')}"
               :error="$t('部门不能为空')"
             >
               <el-select
@@ -65,7 +65,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="salesmanName"
-              required
+              :rules="{required:true,message:$t('业务员不能为空')}"
               :error="$t('业务员不能为空')"
             >
               <el-select v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
@@ -84,7 +84,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="applicationAt"
-              required
+              :rules="{required:true,message:$t('申请日期不能为空')}"
               :error="$t('申请日期不能为空')"
             >
               <el-date-picker
@@ -145,7 +145,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="latestPayAt"
-              required
+              :rules="{required:true,message:$t('最后付款日期不能为空')}"
               :error="$t('最后付款日期不能为空')"
               :datafld="interdict"
             >
@@ -164,7 +164,7 @@
               label=""
               label-width="0"
               style="margin-bottom: 0"
-              required
+              :rules="{required:true,message:$t('结算方式不能为空')}"
               :error="$t('选择结算方式')"
               prop="settlementType"
             >

src/views/ecw/financial/creatPayment.vue

@@ -15,7 +15,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="supplierId"
-              :rules="{ required: true, trigger: ['blur', 'change'] }"
+              :rules="{ required: true, trigger: ['blur', 'change'],message:$t('供应商不能为空') }"
               :error="$t('供应商不能为空')"
             >
               <!-- <customer-selector v-model="form.supplierId" @change="consignor = $event" /> -->
@@ -39,7 +39,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="departmentId"
-              required
+              :rules="{required:true,message:$t('部门不能为空')}"
               :error="$t('部门不能为空')"
             >
               <el-select
@@ -62,7 +62,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="salesmanName"
-              required
+              :rules="{required:true,message:$t('业务员不能为空')}"
               :error="$t('业务员不能为空')"
             >
               <el-select v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
@@ -81,7 +81,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="applicationAt"
-              required
+              :rules="{required:true,message:$t('申请日期不能为空')}"
               :error="$t('申请日期不能为空')"
             >
               <el-date-picker
@@ -119,7 +119,7 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="latestPayAt"
-              required
+              :rules="{required:true,message:$t('最后付款不能为空')}"
               :error="$t('最后付款日期不能为空')"
             >
               <el-date-picker
@@ -137,7 +137,7 @@
               label=""
               label-width="0"
               style="margin-bottom: 0"
-              required
+              :rules="{required:true,message:$t('结算方式不能为空')}"
               :error="$t('选择结算方式')"
               prop="settlementType"
             >

src/views/ecw/order/detail.vue

@@ -292,6 +292,7 @@
             <el-table-column :label="$t('操作人类型')" width="100">
               <template slot-scope="{row}">{{ row.userType == 1 ? $t('会员') : $t('管理员') }}</template>
             </el-table-column>
+            <el-table-column :label="$t('操作类型')" prop="type" width="150"></el-table-column>
             <el-table-column :label="$t('操作描述')" prop="msg" width="300"></el-table-column>
             <el-table-column :label="$t('备注')" prop="note">
               <template slot-scope="{row}">
@@ -497,8 +498,6 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
-
-    console.log('2023-01-14 23:23 看到此消息则表示代码最新')
   },
   methods: {
     checkPermi, // 检查权限

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

@@ -81,14 +81,17 @@
         prop="address"
         :label="$t('操作')">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>
+          <warehouse v-if="isEdit" :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('修改')" :order="order" @close="getList"></warehouse>
+<!--          <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>-->
           <template v-else-if="wareItem(row.orderItemId) && wareItem(row.orderItemId).orderWarehouseInBackItemDoList && wareItem(row.orderItemId).orderWarehouseInBackItemDoList.length > 0">
 <!--            <template v-if="!order.parentOrderId">-->
-              <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>
+            <warehouse :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('追加')" :order="order" @close="getList"></warehouse>
+<!--            <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>-->
               <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
 <!--            </template>-->
           </template>
-          <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>
+          <warehouse v-else :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('入仓')" :order="order" @close="getList"></warehouse>
+<!--          <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -212,6 +215,7 @@ import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseRe
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
 import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
+import Warehouse from "@/views/ecw/order/warehousing/components/Warehouse"
 export default {
   name: "Warehousing",
 
@@ -223,12 +227,13 @@ export default {
     PrintWarehouseReceipt,
     imageUpload,
     ImageAndVideoUpload,
+    Warehouse
   },
 
   mounted() {
     if(this.$route.query.id){
       this.orderId = parseInt(this.$route.query.id || undefined)
-      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
       getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
 
       Promise.all([
@@ -286,6 +291,10 @@ export default {
   },
 
   methods: {
+    getList(){
+      this.getOrder()
+      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
+    },
     getWarehousePictureList(){
       return warehousePictureList({
         bizId: this.order.orderId,
@@ -439,7 +448,7 @@ export default {
             message: this.$t('货物退仓成功!')
           });
 
-          getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+          getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
           this.getOrder()
         })
 
@@ -452,7 +461,7 @@ export default {
     warehousingVisible(val) {
       if (!val){
         this.getOrder()
-        getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+        getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
       }
     },
     orderSpecialNeeds(val){