短信模块实作

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

 <template>
-  <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
-    <el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item :label="$t('订单号')">
-            {{ detail.orderNo }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('体积')">
-            {{ detail.sumVolume }}m³
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('重量')">
-            {{ detail.sumWeight }}kg
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('总箱数')">
-            {{ detail.sumNum }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('总控货箱数')">
-            {{ detail.sumNum }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
+      <el-form v-if="agreement"  ref="form" :model="formData" :rules="rules" size="small" label-width="140px" >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item :label="$t('订单号')">
+              {{detail.orderNo}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('体积')">
+              {{detail.sumVolume }}m³
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('重量')">
+              {{detail.sumWeight }}kg
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('总箱数')">
+              {{detail.sumNum }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('总控货箱数')">
+              {{detail.sumNum}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
           <el-form-item :label="$t('剩余放货箱数')">
             {{ detail.sumNum - detail.releaseNum }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('到仓日期/卸柜日期')">
-            {{ detail.unloadTime || '-'}}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+              {{detail.unloadTime|| '-'}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
           <el-form-item :label="$t('放货锁定收货人到期')">
             {{ detail.lockConsigneeTime || '-' }}
           </el-form-item>
@@ -137,13 +137,14 @@
                     isTransport: 0,
                     transportId: 0,
                     isOrders: 0,
-                }"/>
-      </el-form-item>
-      <el-form-item label="" style="margin-top:20px">
-        <el-button type="success" @click="submit">{{ $t('确认提货') }}</el-button>
-        <el-button type="default" @click="closeDialog">{{ $t('关闭') }}</el-button>
-      </el-form-item>
-    </el-form>
+                }"
+          />
+        </el-form-item>
+        <el-form-item label="" style="margin-top:20px">
+          <el-button type="success" @click="submit">{{$t('确认提货')}}</el-button>
+          <el-button type="default" @click="closeDialog">{{$t('关闭')}}</el-button>
+        </el-form-item>
+      </el-form>
 
     <div v-else>
       <!-- <release-agreement /> -->

src/views/system/sms/smsNode.vue

@@ -19,7 +19,7 @@
       <el-form-item label="国家" prop="countryId">
         <el-select filterable clearable v-model="queryParams.countryId" :placeholder="$t('请选择国家')">
           <el-option key="0" label="全部" :value="parseInt(0)" />
-          <el-option key="1" label="其他" :value="parseInt(1)" />
+          <el-option key="-1" label="其他" :value="parseInt(-1)" />
           <el-option v-for="dict in countryList"
                       :key="dict.id" :label="$l(dict, 'name')" :value="parseInt(dict.id)" />
         </el-select>
@@ -91,7 +91,7 @@
       </el-table-column>
       <el-table-column label="国家" align="center" prop="countryId">
         <template slot-scope="scope">
-          {{ scope.row.countryId | guojia(countryMap) }}
+          {{ scope.row.countryId!=null?countryMap.get(scope.row.countryId)!=null?countryMap.get(scope.row.countryId).nameZh:'':'' }}
         </template>
       </el-table-column>