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

src/views/ecw/box/shippingAir/nodePage/preinstall.vue

@@ -39,7 +39,7 @@
       <el-form-item :label="$t('品名')" prop="itemName">
         <el-input v-model="queryParams.itemName" :placeholder="$t('请输入品名')" clearable />
       </el-form-item>
-      <el-form-item :label="$t('重货比')" prop="weightRatioMax">
+      <el-form-item :label="$t('泡货比')" prop="weightRatioMax">
         <el-input v-model="queryParams.weightRatioMax" :placeholder="$t('请输入 大')" clearable />
       </el-form-item>
       <el-form-item label="" prop="weightRatioMin">
@@ -177,7 +177,7 @@
                     </template>
                   </template>
                     </el-table-column>
-                    <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
+                    <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('泡货比')" align="center" width="140" prop="volumeWeight">
                       <template slot-scope="scope">
                         <p v-if="scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
                         <p v-if="scope.row.warehouseInInfoVO.weight">{{getTotlContent(scope.row.warehouseInInfoVO,['weight'])}}</p>
@@ -265,7 +265,7 @@
                   <p>{{getShipChannelName(item.channelId)}}</p>
                 </div>
                 <div>
-                  <p>{{$t('重货比')}}：</p>
+                  <p>{{$t('泡货比')}}：</p>
                   <p>{{item.weightRatio}}</p>
                 </div>
                 <div v-if="item.isExternalWarehouse === 1" style="color:blue;fontWeight:bold;">

src/views/ecw/box/shippingAir/nodePage/tally/warehouseDetail.vue

@@ -3,7 +3,14 @@
   <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="95%" append-to-body>
     <el-table v-if="warehouseItem && warehouseItem.orderWarehouseInBackItemDoList" :data="warehouseItem.orderWarehouseInBackItemDoList">
       <el-table-column type="index" :label="$t('序号')" />
-      <el-table-column :label="$t('箱数')" prop="cartonsNum" />
+      <el-table-column :label="$t('箱数')" prop="cartonsNum">
+        <template slot-scope="{row}">
+          <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
+            <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" :num="row.cartonsNum" text readonly />
+          </template>
+          <template v-else>{{ row.cartonsNum }}</template>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" />
@@ -44,10 +51,13 @@
 </template>
 <script>
 import { getOrder, getOrderWarehouseIn } from "@/api/ecw/order";
-import { DICT_TYPE } from "@/utils/dict";
 import { parseTime } from "@/utils/ruoyi";
+import WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
 export default {
   filters: { parseTime },
+  components: {
+    WarehouseRecordDetail
+  },
   props: {
     order: Object, // order 和 orderId 二选一
     orderId: Number,

src/views/ecw/box/shippingSea/nodePage/tally/warehouseDetail.vue

@@ -3,7 +3,14 @@
   <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="95%" append-to-body>
     <el-table v-if="warehouseItem && warehouseItem.orderWarehouseInBackItemDoList" :data="warehouseItem.orderWarehouseInBackItemDoList">
       <el-table-column type="index" :label="$t('序号')" />
-      <el-table-column :label="$t('箱数')" prop="cartonsNum" />
+      <el-table-column :label="$t('箱数')" prop="cartonsNum">
+        <template slot-scope="{row}">
+          <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
+            <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" :num="row.cartonsNum" text readonly />
+          </template>
+          <template v-else>{{ row.cartonsNum }}</template>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" />
@@ -44,10 +51,13 @@
 </template>
 <script>
 import { getOrder, getOrderWarehouseIn } from "@/api/ecw/order";
-import { DICT_TYPE } from "@/utils/dict";
+import WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
 import { parseTime } from "@/utils/ruoyi";
 export default {
   filters: { parseTime },
+   components: {
+    WarehouseRecordDetail
+  },
   props: {
     order: Object, // order 和 orderId 二选一
     orderId: Number,

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

@@ -46,7 +46,16 @@
             <el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
           </el-select>
         </el-form-item>
-
+          <el-form-item :label="$t('出货渠道')" prop="channelId">
+            <!--嵌套一个form来脱离disabled控制-->
+              <selector
+                :clearable="true"
+                v-model="queryParams.channelId"
+                :options="channelList"
+                value-field="channelId"
+                :label-field="$l(null, 'name')"
+                ></selector>
+          </el-form-item>
       </el-row>
       <el-row>
         <el-form-item :label="$t('控货')+':'">
@@ -284,12 +293,14 @@ import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import Template from "@/views/cms/template/index.vue";
+import {getChannelList} from '@/api/ecw/channel'
+import Selector from '@/components/Selector'
 
 export default {
   name: "EcwOrderException",
   components: {
     Template,
-    CustomerSelector,ProductSelector
+    CustomerSelector,ProductSelector,Selector
   },
   data() {
     return {
@@ -315,14 +326,15 @@ export default {
        warehouseList:[],
        totalData:{},
        followUpList:[],
+       channelList: [], // 出货取到
     };
   },
   activated(){
     this.getList();
   },
-  created() {
+  async created() {
     this.getList();
-
+    this.channelList = (await getChannelList()).data
     getTradeCityList().then(res => this.tradeCityList = res.data)
     listServiceUser().then(r => {
       this.creatorData = r.data