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

src/views/ecw/customer/index.vue

@@ -720,7 +720,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + id + this.$t('"的数据项?')).then(function() {
+      const name = row.name;
+      const number = row.number;
+      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + number + this.$t('"的数据项?')).then(function() {
           return deleteCustomer(id);
         }).then(() => {
           this.getList();

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

@@ -14,7 +14,10 @@
         <el-form-item v-for="(item,index) in  this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'">
           <el-input style="width: 300px;" v-model="specialNeedsList[index].transFee">
             <div style="width: 100px;" slot="append" >
-              <dict-selector   v-model="specialNeedsList[index].transCurrency"  :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" ></dict-selector>
+              <!-- <dict-selector   v-model="specialNeedsList[index].transCurrency"  :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" ></dict-selector> -->
+              <el-select   v-model="specialNeedsList[index].transCurrency">
+                <el-option v-for="item in JSON.parse(currency)" :key="item.id" :label="item.titleZh" :value="item.id" />
+              </el-select>
             </div>
           </el-input>
            <div style="display: inline-block;margin-left: 20px;">
@@ -35,6 +38,7 @@
 <script>
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import {specialNeedCreate,getSpecialListByOrderId} from "@/api/ecw/order";
+
 export default {
   name: "specialNeeds",
   props:{
@@ -43,6 +47,7 @@ export default {
     },
     orderNo:[String,Number],
     show:Boolean,
+    currency:String
   },
   computed:{
 
@@ -56,8 +61,10 @@ export default {
       specialNeedsList:[],
       todoDetail:'',
       echoList:[],
+
     }
   },
+
   methods:{
     submit(){
       this.specialNeedsList.forEach(i => {

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

@@ -260,7 +260,7 @@ export default {
             getOrder(res.data.orderIds).then(r =>{
               this.FeeDetails = r.data
               this.FeeDetails.details = JSON.parse(res.data.details)
-              const orderItem = this.FeeDetails.orderItemVOList.find(e => e.brand === this.FeeDetails.details.brand)
+              const orderItem = this.FeeDetails.orderItemVOList.find(e => e.orderItemId === this.FeeDetails.details.orderItemId)
               if (orderItem){
                 this.prodName = orderItem.prodTitleZh + '(' + orderItem.prodTitleEn + ')'
               }

src/views/ecw/order/feeApplication.vue

@@ -28,7 +28,10 @@
          </el-table-column>
          <el-table-column :label="$t('货币类型')">
            <template v-slot:default = 'scope'>
-             <dict-selector  :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" v-model="scope.row.applicationFeeCurrency" />
+             <el-select   :disabled="isModify[forbidden(scope.row)]"  v-model="scope.row.applicationFeeCurrency">
+               <el-option v-for="item in JSON.parse(currencys)" :key="item.id" :label="item.titleZh" :value="item.id" />
+             </el-select>
+             <!-- <dict-selector  :disabled="isModify[forbidden(scope.row)]" :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" v-model="scope.row.applicationFeeCurrency" /> -->
            </template>
          </el-table-column>
          <el-table-column :label="$t('付款类型')">
@@ -91,7 +94,8 @@ export default {
     dialogVisible:{
       type:Boolean,
       default:false,
-    }
+    },
+    currencys:String
   },
   data(){
     return {

src/views/ecw/order/index.vue

@@ -19,7 +19,7 @@
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
         <el-date-picker v-model="dateFilter"
-          type="daterange" range-separator="-" 
+          type="daterange" range-separator="-"
           :start-placeholder="$t('开始日期')"
           :end-placeholder="$t('结束日期')"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -370,14 +370,14 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
       @pagination="getList" />
 
-    <special-needs :orderNo="orderNo" :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs>
+    <special-needs :orderNo="orderNo" :show.sync="isShow" :currency="JSON.stringify(currencyList)" :order-id="orderId" @determine="getList" ></special-needs>
     <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
     <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/>
     <withdrawal v-if="show" :dialog-visible="show"  :orderId="orderId" ></withdrawal>
     <batch-single-application :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
-    <fee-application :order-id="orderId" :dialog-visible.sync="feeApplicationBol"></fee-application>
+    <fee-application :order-id="orderId" :currencys="JSON.stringify(currencyList)" :dialog-visible.sync="feeApplicationBol"></fee-application>
     <merge-log :order-no="showMergedLogOrderNo" v-if="showMergedLogOrderNo !== null" @close="showMergedLogOrderNo=null" />
     <pickup-log v-if="showPickupLogOrderNo" :order-no="showPickupLogOrderNo" @close="showPickupLogOrderNo=null" @delete="getList" />
   </div>
@@ -414,6 +414,7 @@ import FeeApplication from "@/views/ecw/order/feeApplication";
 import MergeLog from '@/views/ecw/order/components/MergeLog'
 import PickupLog from './components/PickupLog'
 import {getWarehouseList} from '@/api/ecw/warehouse'
+import { getCurrencyPage } from "@/api/ecw/currency";
 export default {
   name: "EcwOrderIndex",
   components: {
@@ -477,7 +478,12 @@ export default {
       multipleSelection:[],
 
       transportId: null, // 指定运输方式
-      orderNo:''
+      orderNo:'',
+      params: {
+        page: 1,
+        rows: 20,
+      },
+      currencyList:[]
     };
   },
   computed: {
@@ -529,6 +535,8 @@ export default {
     getProductAttrList().then(res => this.productAttrList = res.data)
     // getTradeCityList().then(res => this.tradeCityList = res.data)
     getWarehouseList().then(res => this.warehouseList = res.data)
+
+    getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
     // 提取路径中的运输方式

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

@@ -624,8 +624,8 @@ export default {
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
                 num: this.warehousing.num,
-                volume: this.warehousing.volume?.toFixed(2) || '',
-                weight: this.warehousing.weight?.toFixed(2) || '',
+                volume: (+this.warehousing.volume)?.toFixed(2) || '',
+                weight: (+this.warehousing.weight)?.toFixed(2) || '',
                 prodId: this.warehousing.prodId,
                 "orderWarehouseInUpdateItemDoList": this.tableData.map(e => {
                   return {

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

@@ -69,7 +69,7 @@
         :label="$t('状态')">
         <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
         <span class="red" v-else-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
-        <span v-else>{{ $t('待入仓') }}</span>
+        <span :class="{red: row.itemStatus === 3}" v-else>{{ row.itemStatus === 3 ? ($t('少了') + row.num + $t('箱')) : $t('待入仓') }}</span>
       </el-table-column>
       <el-table-column
         prop="address"