短信模块实作

src/api/system/sms/smsNode.js

+import request from '@/utils/request'
+
+// 创建短信节点
+export function createSmsNode(data) {
+  return request({
+    url: '/system/sms-node/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新短信节点
+export function updateSmsNode(data) {
+  return request({
+    url: '/system/sms-node/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除短信节点
+export function deleteSmsNode(id) {
+  return request({
+    url: '/system/sms-node/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得短信节点
+export function getSmsNode(id) {
+  return request({
+    url: '/system/sms-node/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得短信节点分页
+export function getSmsNodePage(query) {
+  return request({
+    url: '/system/sms-node/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出短信节点 Excel
+export function exportSmsNodeExcel(query) {
+  return request({
+    url: '/system/sms-node/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/system/sms/smsTemplate.js

@@ -62,3 +62,11 @@ export function exportSmsTemplateExcel(query) {
   })
 }
 
+// 获得短信模板列表
+export function getSmsTemplateList(query) {
+  return request({
+    url: '/system/sms-template/list',
+    method: 'get',
+    params: query
+  })
+}

src/utils/dict.js

@@ -27,6 +27,9 @@ export const DICT_TYPE = {
   SYSTEM_SMS_TEMPLATE_TYPE: "system_sms_template_type",
   SYSTEM_SMS_SEND_STATUS: "system_sms_send_status",
   SYSTEM_SMS_RECEIVE_STATUS: "system_sms_receive_status",
+  SYSTEM_SMS_NODE_NODE: 'system_sms_node_node',//节点
+  SYSTEM_SMS_TEMPLATE_MESSAGE_TYPE: 'system_sms_template_message_type',//发送类型
+  SYSTEM_SMS_TEMPLATE_LANGUAGE: 'system_sms_template_language',//节点
   SYSTEM_MAIL_SEND_STATUS: "mail_send_status",
   SYSTEM_ERROR_CODE_TYPE: "system_error_code_type",
   INTERNAL_MESSAGE_TYPE: "internal_message_type",

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

@@ -28,13 +28,22 @@
         <el-form-item :label="$t('上传凭证')">
           <image-upload v-model="formData.voucher" />
         </el-form-item>
-        
+
         <el-form-item :label="$t('控货手机号')">
             +{{detail.dialCode}} {{detail.phone}}
         </el-form-item>
         <el-form-item :label="$t('手机验证码')">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
-            <send-sms-code :order-id="order.orderId" :scene="5" />
+            <send-sms-code
+              :form="{
+                orderId: order.orderId,
+                nodeValue: 'delivery-verification-sms',
+                isTransport: 0,
+                transportId: 0,
+                isOrders: 0,
+                messageType: ''
+              }"
+            />
         </el-form-item>
 
         <div class="title">{{$t('审批流程')}}</div>
@@ -125,4 +134,4 @@ export default {
     margin-right:10px;
   }
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -38,7 +38,16 @@
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="field106">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
-            <send-sms-code :order-id="order.orderId" :scene="5" />
+            <send-sms-code
+              :form="{
+                orderId: order.orderId,
+                nodeValue: 'delivery-verification-sms',
+                isTransport: 0,
+                transportId: 0,
+                isOrders: 0,
+                messageType: ''
+              }"
+            />
         </el-form-item>
         <div class="title">{{$t('审批流程')}}</div>
         <work-flow xmlkey="release_goods" v-model="ccIdArr"  />
@@ -109,7 +118,7 @@ export default {
         submit(){
             let data = Object.assign({}, this.formData, {
                 cargoControlPickId: this.info.id,
-                
+
                 orderId: this.order.orderId,
                 orderNo: this.order.orderNo
             })

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

@@ -29,8 +29,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
-        
+
+
 
         <el-form-item :label="$t('反复核原因')" prop="recurrentNuclearType">
             <dict-selector :type="DICT_TYPE.ECW_PICK_RECURRENT_NUCLEAR_TYPE" v-model="formData.recurrentNuclearType" form-type="radio" />
@@ -43,11 +43,20 @@
             <template v-else>
               +{{order.cargoControlCountryCode}} {{order.cargoControlPhone}}
             </template>
-           
+
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="code">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
-            <send-sms-code :order-id="order.orderId" :scene="5" />
+            <send-sms-code
+              :form="{
+                orderId: order.orderId,
+                nodeValue: 'delivery-verification-sms',
+                isTransport: 0,
+                transportId: 0,
+                isOrders: 0,
+                messageType: ''
+              }"
+            />
         </el-form-item>
         <div class="title">{{$t('审批流程')}}</div>
         <work-flow xmlkey="release_goods" v-model="ccIdArr"  />
@@ -114,7 +123,7 @@ export default {
             this.$refs.form.validate().then(res => {
                 let data = Object.assign({}, this.formData, {
                     cargoControlPickId: this.info.id,
-                    
+
                     orderId: this.order.orderId,
                     orderNo: this.order.orderNo
                 })

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>
@@ -131,13 +131,20 @@
         <el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable
                   class="w-150 mr-10"></el-input>
         <!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
-        <send-sms-code :order-id="detail.orderId" scene="5"/>
-      </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>
+        <send-sms-code :form="{
+                    orderId: detail.orderId,
+                    nodeValue: 'delivery-verification-sms',
+                    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>
 
     <div v-else>
       <!-- <release-agreement /> -->

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

 <template>
-    <el-button @click="send" :disabled="leftTime > 0 && leftTime < 60">{{text}}</el-button>
+    <el-dropdown @command="send" :disabled="leftTime > 0 && leftTime < 60">
+      <el-button type="primary">
+        {{ text }}<i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="1">SMS</el-dropdown-item>
+        <el-dropdown-item command="2">WhatsApp</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
 </template>
 <script>
 import {sendSmsCode} from '@/api/ecw/orderCargoControl'
 let timeout = null
 export default {
     props:{
-        orderId: [String, Number],
-        scene: [String, Number]
+        form: Object
     },
     data(){
         return {
@@ -30,13 +37,11 @@ export default {
         if(timeout)clearTimeout(timeout)
     },
     methods:{
-        send(){
+        send(messageType){
             if(this.loading || (this.leftTime > 0 && this.leftTime < 60)) return false
             this.loading = true
-            sendSmsCode({
-                orderId: this.orderId,
-                scene: this.scene
-            }).then(res => {
+            this.form['messageType'] = messageType
+            sendSmsCode(this.form).then(res => {
                 this.$message.success(this.$t('发送成功'))
                 this.countDown()
             }).finally(res => {

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

@@ -8,7 +8,7 @@
               <el-form-item :label="$t('原控货手机号')">
                 <el-input :value="'+' + cargoControlCountryCode + ' ' + cargoControlPhone" disabled></el-input>
               </el-form-item>
-              
+
               <el-form-item :label="$t('新控货人')" prop="name">
                 <el-input v-model="form.name"></el-input>
               </el-form-item>
@@ -21,7 +21,15 @@
               </el-form-item>
               <el-form-item :label="$t('手机验证码')" prop="code">
                 <el-input v-model.number="form.code" type="number" class="w-200 mr-10"></el-input>
-                <send-sms-code :order-id="orderId" scene="4" />
+                <send-sms-code
+                  :form="{
+                      orderId: orderId,
+                      nodeValue: 'transfer-control-goods',
+                      isTransport: 0,
+                      transportId: 0,
+                      isOrders: 0,
+                  }"
+                />
               </el-form-item>
               <el-form-item label="">
                 <el-button type="primary" @click="submit">{{$t('确定转移')}}</el-button>
@@ -111,8 +119,8 @@ export default {
                 this.closeDialog()
               })
           })
-          
+
         }
     }
 }
-</script>
\ No newline at end of file
+</script>

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

@@ -63,7 +63,16 @@
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="code">
           <el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable class="w-150 mr-10"></el-input>
-          <send-sms-code :order-id="detail.orderId" scene="5" />
+          <send-sms-code
+            :form="{
+              orderId: detail.orderId,
+              nodeValue: 'delivery-verification-sms',
+              isTransport: 0,
+              transportId: 0,
+              isOrders: 0,
+              messageType: ''
+            }"
+          />
         </el-form-item>
         <div class="page-title">{{$t('审批流程')}}</div>
         <work-flow v-model="ccIdArr" xmlkey="transfer_goods" />

src/views/system/sms/smsLog.vue

@@ -178,6 +178,11 @@
             <el-form-item label="API 接收结果：">{{ form.apiReceiveCode }} | {{ form.apiReceiveMsg }}
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="节点模板序列号：">
+              {{ form.nodeTemplateSn }}
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">