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

.env.development

@@ -5,6 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
+
 VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
 
 # 路由懒加载

src/api/ecw/orderHandle.js

@@ -97,7 +97,7 @@ export function exportSplitExcel(query) {
 //通过订单号获取拆单列表和拆单项明细
 export function getSplitList(query) {
   return request({
-    url: '/order/split/list-by-order-id',
+    url: '/ecw/box-approval/list-by-order-id',
     method: 'get',
     params: query
   })

src/views/ecw/order/splitApply.vue

@@ -182,7 +182,7 @@
     <div slot="footer" class="card footer_btn" v-if="orderData.abnormalState==0">
         <el-button  v-if="orderData.inWarehouseState!=207" type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
         <el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
-        <el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.formId)">{{$t('审核中')}}</el-button>
+        <el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.applyingFormId)">{{$t('审核中')}}</el-button>
         <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
         <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
     </div>

src/views/ecw/order/weightDeal.vue

@@ -84,17 +84,17 @@
          </el-table-column>
         <el-table-column :label="$t('重货方数')"  v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{scope.row.wvolume||0}}CBM</span>
+            <span>{{scope.row.weVolume||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('泡货方数')" v-if="type!='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{scope.row.wvolume||0}}CBM</span>
+            <span>{{scope.row.weVolume||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('重货重量')"  v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{scope.row.vweight||0}}KG</span>
+            <span>{{scope.row.voWeight||0}}KG</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('泡货重量')" v-if="type!='order_heavy_cargo_exception'" >

src/views/system/sms/smsTemplate.vue

@@ -174,6 +174,9 @@
 <!--            </el-select>-->
 <!--&lt;!&ndash;          </template>&ndash;&gt;-->
 <!--        </el-table-column>-->
+        <el-form-item :label="$t('区号')" prop="areaCode">
+          <el-input v-model="sendSmsForm.areaCode" :placeholder="$t('请输入区号')" />
+        </el-form-item>
         <el-form-item :label="$t('手机号')" prop="mobile">
           <el-input v-model="sendSmsForm.mobile" :placeholder="$t('请输入手机号')" />
         </el-form-item>