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

src/utils/dict.js

@@ -154,6 +154,7 @@ export const DICT_TYPE = {
   DISBURSEMENT_TYPE: 'disbursement_type',//垫付类型
   DRAWEE: 'drawee', // 付款人
   ORDER_STATUS: 'order_status',//订单状态
+  ORDER_ITEM_STATUS:'order_item_status',
   BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态

src/views/bpm/processInstance/index.vue

@@ -2,11 +2,8 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属流程" prop="processDefinitionId">
-        <el-input v-model="queryParams.processDefinitionId" placeholder="请输入流程定义的编号" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="流程名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="流程名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="流程分类" prop="category">
         <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable>

src/views/bpm/task/todo.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入任务名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="流程分类" prop="category">
         <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable>

src/views/ecw/financial/creatPayment.vue

@@ -106,7 +106,7 @@
                   v-for="item in bankData"
                   :key="item.id"
                   :label="item.bankName + '(' + item.bankAccount+ ')'"
-                  :value="item.id"
+                  :value="item.bankAccount"
                 />
               </el-select>
             </el-form-item>
@@ -471,9 +471,10 @@ export default {
           ...res.data,
           latestPayAt: this.parseTime(res.data.latestPayAt, '{y}-{m}-{d}'),
           applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}'),
-          supplierBankAccount: Number(res.data.supplierBankAccount),
           invoiceStatus: String(res.data.invoiceStatus),
         }
+        this.$set(this.form,'supplierBankAccount',res.data.supplierBankAccount)
+        console.log(this.form)
       })
       getPaymentItem({ id: this.id }).then(res => {
         this.list = [...res.data]
@@ -613,7 +614,6 @@ export default {
     },
     selectChangeBank(val){
       this.$forceUpdate()
-      console.log(this.form.supplierBankAccount)
     },
     selectChange(val) {
       this.bankData = []
@@ -621,7 +621,8 @@ export default {
       if(val){
         getSupplier(val).then((res)=>{
           this.bankData = res.data.bankList
-          this.form.supplierBankAccount=''
+          var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
+          if(this.bankData.length==0||!bank) this.form.supplierBankAccount=''
         })
       }
 

src/views/ecw/financial/voucher.vue

@@ -115,7 +115,8 @@
       </el-table-column>
       <el-table-column label="收款单号" align="center" prop="receiptNo">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button>
+          <span>{{scope.row.receiptNo}}</span>
+          <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
         </template>
       </el-table-column>
       <!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
@@ -371,7 +372,7 @@ export default {
     },
     submitForm(type) {
       receiptExportExcel({ id: this.exportId, billType: type }).then((response) => {
-          this.$download.excel(response, `${type === 2 ? "国外账单" : "Debite_note"}.xls`);
+          this.$download.excel(response, `${type === 1 ? "国外账单" : "Debite_note"}.xls`);
           this.open = false;
         }
       );

src/views/ecw/offer/components/Commossion.vue

@@ -61,7 +61,7 @@
           <template v-if="darkCommission">
             {{$t('暗佣')}}：{{darkCommission}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
           </template>
-          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">去设置</el-link>
+          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">去设置</el-link>
         </div>
 
         <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>

src/views/ecw/order/components/warehouseDetails.vue

@@ -133,7 +133,14 @@
   <div v-if="type === 4">
     <p>申请理由</p>
     <div>
-      {{ FeeDetails.details || '' }}
+      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ FeeDetails.details.applyInfoVOList[0].newValue }}】信息：
+      <ol>
+        <template v-for="item in FeeDetails.details.applyInfoVOList">
+          <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
+          <li v-else-if="item.newValue === undefined">删除入仓</li>
+          <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
+        </template>
+      </ol>
     </div>
   </div>
 </div>

src/views/ecw/order/edit.vue

@@ -313,7 +313,7 @@
                 </el-form-item>
             </div>
             <div v-if="homeDeliveryService && form.harvestMethod == 2">
-                <el-form-item :label="$t('收货地区')">
+                <el-form-item :label="$t('收货地区')" prop="country">
                     <area-selector
                     :country="form.consigneeVO ? form.consigneeVO.country : undefined"
                     :province="form.consigneeVO ? form.consigneeVO.province : undefined"
@@ -406,8 +406,9 @@
                 <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">{{$t('审核中')}}</el-button>
             </template>
             <template v-else>
-                <el-button type="primary" @click="submitForm(0)">{{$t('保存')}}</el-button> <!--草稿-->
-                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId">{{$t('新建')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿-->
+                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('保存订单')}}</el-button> <!--修改-->
             </template>
             <el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
         </el-form-item>
@@ -517,7 +518,8 @@ export default {
         type:[],
         isExternalWarehouse: false,
         externalWarehouseDtoList:[{}],
-        orderItemVOList:[]
+        orderItemVOList:[],
+        drawee: 2
       },
       ccIdArr: [],
       // 表单校验
@@ -542,7 +544,8 @@ export default {
         lineId              : [{required: true, message: this.$t('请选择路线')}],
         channelId           : [{required: true, message: this.$t('请选择出货渠道')}],
         deliveryDate        : [{required: true, message: this.$t('请选择送货日期')}],
-        consigneeAddress    : [{required: true, message: this.$t('请填写详细地址')}]
+        consigneeAddress    : [{required: true, message: this.$t('请填写详细地址')}],
+        country             : [{required: true, message: this.$t('收货地区填写不完整')}]
       },
       labelStyle: 'width:120px',
       showBatchImportDialog: false, // 显示批量导入弹窗
@@ -912,6 +915,16 @@ export default {
           return this.$showFormValidateErrors(errors)
         }
 
+        if(this.form.harvestMethod == 2){
+            if(!this.form.country || !this.form.province || !this.form.city){
+                return this.$notify({
+                    title: '提示',
+                    message: "收货地区填写不完整",
+                    type: 'warning'
+                });
+            }
+        }
+
         this.form.orderItemVOList.map(item => {
             item.prodAttrIds = item.prodAttrArr.join(',')
         })

src/views/ecw/order/prepayDeal.vue

@@ -229,7 +229,7 @@
                 </el-form-item>
               </el-row>
                <el-row >
-                <el-form-item :label="$t('赔付金额')+':'" size="medium" required v-if="handlerParams.orderExceptionStatus==2&&handlerParams.orderExceptionHandlerResult=='confirm_loss'">
+                <el-form-item :label="$t('赔付金额')+':'" size="medium" required v-if="handlerParams.orderExceptionStatus==2">
                   <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
                   <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
                   <el-option  v-for="dict in getDictDatas('shipping_price_unit') "

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

@@ -67,7 +67,7 @@
           <template v-if="darkCommission">
             {{$t('暗佣')}}：{{darkCommission}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
           </template>
-          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">{{$t('去设置')}}</el-link>
+          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + order.customerId)">{{$t('去设置')}}</el-link>
         </div>
 
         <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{Decimal(form.freight).plus(form.lightCommissionAmount) }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>

src/views/ecw/order/splitApply.vue

@@ -85,16 +85,16 @@
                 <span>{{$t('体积')}}：{{scope.row.volume||$t('未填')}}m³</span>
               </el-row>
               <el-row>
-                <span>{{$t('重量')}}：{{scope.row.weight||t('未填')}}kg</span>
+                <span>{{$t('重量')}}：{{scope.row.weight||$t('未填')}}kg</span>
               </el-row>
             </template>
         </el-table-column>
         <el-table-column :label="$t('入库货物属性')" align="center" width="400">
             <template slot-scope="scope">
-              <el-row>
+              <el-row v-if="scope.row.warehouseInInfoVO">
                 <span>{{$t('规格')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
               </el-row>
-              <el-row>
+              <el-row v-if="scope.row.warehouseInInfoVO">
                 <span>{{$t('品牌')}}：
                   <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
                 </span>
@@ -102,6 +102,9 @@
                 <span style="margin-left: 10px;">{{$t('体积')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.volume}}m³</span>
                 <span style="margin-left: 10px;">{{$t('重量')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.weight}}kg</span>
               </el-row>
+              <el-row v-if="!scope.row.warehouseInInfoVO">
+                <span>{{$t('暂时没有入仓信息')}}</span>
+              </el-row>
             </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" align="center">
@@ -111,8 +114,8 @@
         </el-table-column>
         <el-table-column :label="$t('状态')" align="center">
            <template slot-scope="scope">
-             {{orderData.abnormalState!=0?$t('异常'):$t('正常')}}
-               <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
+             <!-- {{orderData.abnormalState!=0?$t('异常'):$t('正常')}} -->
+               <dict-tag :type="DICT_TYPE.ORDER_ITEM_STATUS" :value="scope.row.itemStatus" />
           </template>
         </el-table-column>
       </el-table>
@@ -134,7 +137,8 @@
           <div>
              <el-button v-if="index==0" disabled type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
                <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
-              <el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
+              <el-button v-if="index==0" disabled type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
+              <el-button v-if="index!=0" type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-table v-if="item.orderSplitItemBackVOList"  border :data="item.orderSplitItemBackVOList">
@@ -290,6 +294,7 @@ export default {
       form:{
 
       },
+      importCityList:[],
       selectedUsers:[],
       shopOpen:false,
 
@@ -318,7 +323,10 @@ export default {
   },
   created() {
     this.getChannel()
-    getWarehouseList().then(res => this.tradeCityList = res.data)
+    getWarehouseList().then(res => {
+      this.tradeCityList = res.data
+      this.importCityList = this.tradeCityList.filter(item => item.type == 1)
+    })
     if (this.$route.query.orderId) {
       this.queryParams.orderId = this.$route.query.orderId
     }
@@ -352,9 +360,6 @@ export default {
     },
     getDictDatas(){
         return getDictDatas
-    },
-    importCityList(){
-        return this.tradeCityList.filter(item => item.type == 1)
     }
   },
   methods: {
@@ -454,6 +459,16 @@ export default {
       this.shopOpen = true
     },
     addSplit(){
+      this.form.transportId = this.orderData.transportId
+      this.form.destWarehouseId = this.orderData.destWarehouseId
+      if(this.orderData.logisticsInfoDto&&this.orderData.logisticsInfoDto.destTitleZh){
+        this.form.destWarehouseId = this.importCityList.find(item=>item.titleZh==this.orderData.logisticsInfoDto.destTitleZh).id
+        if(this.orderData.logisticsInfoDto&&this.orderData.logisticsInfoDto.channelId){
+          this.form.channelId = this.orderData.logisticsInfoDto.channelId
+          }
+
+      }
+
       this.open = true
     },
     changeProdTitleZh(){

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -372,20 +372,20 @@ export default {
       opened: false,
       brandList: [],
       form: {
-        "brand": "0",
-        "brandType": 0,
-        "inTime": "",
-        "material": "",
-        "orderId": 0,
-        "orderItemId": 0,
-        "orderNo": "",
+        // "brand": "0",
+        // "brandType": 0,
+        // "inTime": "",
+        // "material": "",
+        // "orderId": 0,
+        // "orderItemId": 0,
+        // "orderNo": "",
         "orderWarehouseInItemDoList": [],
         "prodAttrIds": "",
         "prodId": 0,
-        "prodTitleEn": "",
-        "prodTitleZh": "",
-        "prodType": 0,
-        "type": 0,
+        // "prodTitleEn": "",
+        // "prodTitleZh": "",
+        // "prodType": 0,
+        // "type": 0,
         feeType: 0,
         recordMode: undefined
       },
@@ -533,7 +533,16 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,
-              "orderWarehouseInUpdateItemDoList": orderWarehouseInItemDoList,
+              cartonsNum: this.warehousing.num,
+              volume: this.warehousing.volume.toFixed(2),
+              weight: this.warehousing.weight.toFixed(2),
+              prodId: this.warehousing.prodId,
+              "orderWarehouseInUpdateItemDoList": this.tableData.map(e => {
+                return {
+                  ...e,
+                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+                }
+              }),
               copyUserId: this.selectedUsers
             }).then(r => {
               if (r.data) {

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

@@ -101,12 +101,12 @@
 
       <h2>订单数据</h2>
       <el-form-item label="总方数" style="width: 300px">
-        <el-input v-model="form.sumVolume" placeholder="请输入总方数">
+        <el-input v-model="form.sumVolume" placeholder="请输入总方数" readonly>
           <span slot="append">m³</span>
         </el-input>
       </el-form-item>
       <el-form-item label="总重量" style="width: 300px">
-        <el-input v-model="form.sumWeight" placeholder="请输入总重量">
+        <el-input v-model="form.sumWeight" placeholder="请输入总重量" readonly>
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>

src/views/ecw/productPrice/edit.vue

@@ -270,6 +270,11 @@ export default {
       /* getProductType(this.product.typeId).then(res => {
         this.productType = res.data
       }) */
+      this.$set(this.form, 'needBook', this.product.needBook)
+      this.$set(this.form, 'square', this.product.square)
+      this.$set(this.form, 'dayLimit', this.product.dayLimit)
+      this.$set(this.form, 'containerLocation', this.product.containerLocation)
+      
     },
     form(val) {
       if (!val) return

src/views/ecw/productPrice/index.vue

@@ -78,7 +78,7 @@
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchOff" :disabled="multiple">{{$t('批量下架')}}</el-button>
 
         <!--指定商品-->
-        <el-button v-if="$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchSetSingleProductPrice">{{$t('批量设置单个商品的路线路线')}}</el-button>
+        <el-button v-if="$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchSetSingleProductPrice">{{$t('批量设置单个商品的路线')}}</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"