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

src/views/ecw/deptTarget/allAchievement.vue

@@ -107,11 +107,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}

src/views/ecw/deptTarget/myAchievement.vue

@@ -111,11 +111,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -110,11 +110,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name"/>
       <el-table-column :label="$t('联系方式')" align="center" prop="phoneNew"/>
       <el-table-column :label="$t('唛头')" align="center" prop="marks"/>
-      <el-table-column :label="$t('订单状态')" align="center">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg"/>
       <el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
         <template slot-scope="scope">
           {{scope.row.isCargoControl?$t('是'):$t('否')}}
@@ -151,7 +147,7 @@
     import dayjs from "dayjs";
     import {listServiceUser} from "@/api/system/user";
     import {getWarehouseList} from '@/api/ecw/warehouse'
-    
+
     export default {
         name: "EcwDepttargetMydeptachievement",
         components: {},
@@ -241,7 +237,7 @@
                     }
                     return '/'
                 }
-            },            
+            },
             exportWarehouseList(){
               /* tradeType 1 进口，2出口，3进出口 */
               return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)

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

@@ -211,7 +211,7 @@
               </template>
             </el-table-column>
             <el-table-column :label="$t('数量(个)')" align="center" prop="quantity" width="80"></el-table-column>
-						<el-table-column :label="$t('成交单价')" align="center" min-width="220px" v-if="[3,4].indexOf(orderData.transportId) > -1">
+						<el-table-column :label="$t('成交单价')" align="center" min-width="220px" v-if="[3,4].indexOf(item.transportId) > -1">
 							<template slot-scope="scope">
 								<template v-if="scope.row.charging != 1">
 									<div class="flex">

src/views/ecw/order/stocking/components/NewProduct.vue

@@ -12,9 +12,10 @@
           <span style="min-width: 200px;margin-right: 15px;display: inline-block">
               <product-selector
                 v-model="form.prodId"
+                @change="handleProdChange"
               />
           </span>
-          <el-button type="text" @click="isShowProduct = true">{{ $t('添加新品名') }}</el-button>
+          <el-button type="text" @click="isShowProduct = true">{{ $t('添加新商品') }}</el-button>
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template>
@@ -22,6 +23,7 @@
             <product-selector
               lang="En"
               v-model="form.prodId"
+							@change="handleProdChange"
             />
           </span>
         </el-descriptions-item>
@@ -272,7 +274,7 @@ import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/Ware
 import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
 
 export default {
-  name: "Package",
+  name: "NewProduct",
   components: {
     ImageAndVideoUpload,
     WarehouseRecordDetail,
@@ -672,6 +674,12 @@ export default {
         titleZh: undefined,
         titleEn: undefined
       }
+    },
+    handleProdChange(prod){
+      console.log('handleProdChange', prod)
+      let attrIds = prod.attrId?.split(',')?.map(item => parseInt(item)) || []
+      this.$set(this.form,'warehouseInProdAttrIds', attrIds)
+      this.$set(this.form, 'material', prod.materialType)
     }
   }
 }