批量设置路线价格阶梯价格异常

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

@@ -23,7 +23,7 @@
             </el-descriptions-item>
         </el-descriptions>
 
-        <template v-for="item in detail.orderSplitBackVOList">
+        <template v-for="item in orderSplitBackVOList">
             <div class="title mt-20" :key="item.orderNo">
                 <span class="mr-10">{{item.orderNo}}</span>
                 <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
@@ -31,28 +31,32 @@
                 <span>{{$t('发往')}}{{item.dstWarehouseName}}</span>
             </div>
             <el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
-            <el-table-column :label="$t('序号')">
-                <template slot-scope="scope">{{scope.$index+1}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('中文品名')">
-                <template slot-scope="{row}">{{row.prodTitleZh}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('英文品名')">
-                <template slot-scope="{row}">{{row.prodTitleEn}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('品牌')">
-                <template slot-scope="{row}">
-                    <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
-                </template>
-            </el-table-column>
-            <el-table-column :label="$t('体积')">
-                <template slot-scope="{row}">{{row.volume}} m³</template>
-            </el-table-column>
-            <el-table-column :label="$t('重量')">
-                <template slot-scope="{row}">{{row.weight}}kg</template>
-            </el-table-column>
-            <el-table-column :label="$t('箱数')">
-                <template slot-scope="{row}">{{row.num}}</template></el-table-column>          
+                <el-table-column :label="$t('序号')">
+                    <template slot-scope="scope">{{scope.$index+1}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('中文品名')">
+                    <template slot-scope="{row}">{{row.prodTitleZh}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('英文品名')">
+                    <template slot-scope="{row}">{{row.prodTitleEn}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('品牌')">
+                    <template slot-scope="{row}">
+                        <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('体积')">
+                    <template slot-scope="{row}">{{row.volume}} m³</template>
+                </el-table-column>
+                <el-table-column :label="$t('重量')">
+                    <template slot-scope="{row}">{{row.weight}}kg</template>
+                </el-table-column>
+                <el-table-column :label="$t('箱数')">
+                    <template slot-scope="{row}">{{row.num}}</template>
+                </el-table-column>     
+                <el-table-column :label="$t('备注')">
+                    <template slot-scope="{row}">{{row.remark}}</template>
+                </el-table-column>          
             </el-table>
         </template>
     </div>
@@ -60,6 +64,7 @@
 <script>
 import {getApproval, getOrder} from '@/api/ecw/order'
 import {getChannel} from '@/api/ecw/channel'
+import {getSplitList} from '@/api/ecw/orderHandle'
 export default {
     props:{
         id: [String, Number]
@@ -68,7 +73,8 @@ export default {
         return {
             detail: null,
             order: null,
-            channel: null
+            channel: null,
+            orderSplitBackVOList: []
         }
     },
     watch:{
@@ -76,6 +82,7 @@ export default {
             this.getData()
         },
         detail(){
+            this.getSplit()
             this.getOrder()
         },
         order(){
@@ -95,6 +102,12 @@ export default {
                 this.detail = JSON.parse(res.data.details)
             })
         },
+        getSplit(){
+            getSplitList({orderId: this.detail.orderId, lang: this.$i18n.locale.toLowerCase().indexOf('zh') > -1 ? 0 : 1 }).then(res => {
+                console.log('getSplitList', res)
+                this.orderSplitBackVOList = res.data.orderSplitBackVOList
+            })
+        },
         getOrder(){
             getOrder(this.detail.orderId).then(res => {
                 this.order = res.data

src/views/ecw/order/splitApply.vue

@@ -236,7 +236,7 @@
                     <el-input-number v-model="shopForm.quantity" controls-position="right"  :min="1" :max="quantitySum"></el-input-number>
                  </el-form-item>
                  <el-form-item :label="$t('备注信息')+':'">
-                    <el-input v-model="shopForm.remarks"></el-input>
+                    <el-input v-model="shopForm.remark"></el-input>
                  </el-form-item>
                </el-row>
              </el-form>
@@ -552,7 +552,7 @@ export default {
         num:this.shopForm.num,
         orderItemId:this.shopForm.orderItemId,
         orderSplitId:this.splitData[this.splitItemIndex].id,
-        remarks:this.shopForm.remarks
+        remark:this.shopForm.remark
       }
       createSplitItem(params).then(res=>{
         this.$message.success(this.$t("放入成功"));

src/views/ecw/productPrice/batchEdit.vue

@@ -68,7 +68,7 @@
             <inputor default2="0" v-model.number="form.minWeight" type="number" class="w-100" :rules="{validator: priceValidator, trigger: 'blur',   message: '数量错误'}"/>
             / <selector v-model="form.minWeightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2  class="w-100" disabled />
           </el-form-item>
-          
+
           <el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
             <inputor default2="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
             <selector v-model="form.allPriceUnit" @input="syncAllUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
@@ -368,7 +368,7 @@ export default {
           data.priceStepList = this.form.priceStepList
         } */
         // 没有设置阶梯价格则不提交priceStepList
-        if(!data.stepPrice != 1){
+        if(data.stepPrice != 1){
           delete data.priceStepList
         }