部分布局调整

src/views/system/phoneDialRecord/index.vue

@@ -125,18 +125,6 @@
         </template>
       </el-table-column>
       <el-table-column label="外呼方式" align="center" prop="phoneDialMethod" />
-      <!-- <el-table-column label="推送结果状态码" align="center" prop="errorCode" /> -->
-      <!-- <el-table-column
-        label="推送结果状态码，success：成功，fail：失败"
-        align="center"
-        prop="errorStatus"
-      /> -->
-      <el-table-column
-        label="录音存储路径"
-        align="center"
-        prop="phoneDialRecordVideo"
-        show-overflow-tooltip
-      />
       <el-table-column label="通话时长" align="center" prop="phoneDuration" />
       <el-table-column label="通话费用" align="center" prop="phoneCost" />
       <el-table-column label="关联账单id" align="center" prop="billId" />
@@ -177,22 +165,24 @@
     <!-- 添加或修改电话拨打记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="患者手机号" prop="patientPhone">
-          <el-input
-            v-model="form.patientPhone"
-            placeholder="请输入患者手机号"
-          />
-        </el-form-item>
-        <el-form-item label="呼叫时间" prop="dialTime">
-          <el-date-picker
-            clearable
-            v-model="form.dialTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择呼叫时间"
-          >
-          </el-date-picker>
-        </el-form-item>
+        <div style="display: flex">
+          <el-form-item label="患者手机号" prop="patientPhone">
+            <el-input
+              v-model="form.patientPhone"
+              placeholder="请输入患者手机号"
+            />
+          </el-form-item>
+          <el-form-item label="呼叫时间" prop="dialTime">
+            <el-date-picker
+              clearable
+              v-model="form.dialTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择呼叫时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
         <el-form-item label="电话模板名称" prop="phoneTemplateName">
           <el-input
             v-model="form.phoneTemplateName"
@@ -202,28 +192,33 @@
         <el-form-item label="电话内容">
           <editor v-model="form.messageNodeContent" :min-height="192" />
         </el-form-item>
-        <el-form-item label="外呼方式" prop="phoneDialMethod">
-          <el-select
-            v-model="form.phoneDialMethod"
-            clearable
-            placeholder="请选择外呼方式"
-          >
-            <el-option label="自动外呼" value="AI" />
-            <el-option label="人工随访电话" value="COMMON" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="推送结果状态码" prop="errorCode">
-          <el-input
-            v-model="form.errorCode"
-            placeholder="请输入推送结果状态码"
-          />
-        </el-form-item>
-        <el-form-item label="通话时长" prop="phoneDuration">
-          <el-input v-model="form.phoneDuration" placeholder="请输入通话时长" />
-        </el-form-item>
-        <el-form-item label="通话费用" prop="phoneCost">
-          <el-input v-model="form.phoneCost" placeholder="请输入通话费用" />
-        </el-form-item>
+        <div style="display: flex">
+          <el-form-item label="外呼方式" prop="phoneDialMethod">
+            <el-select
+              style="width: 206px"
+              v-model="form.phoneDialMethod"
+              clearable
+              placeholder="请选择外呼方式"
+            >
+              <el-option label="自动外呼" value="AI" />
+              <el-option label="人工随访电话" value="COMMON" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="推送结果" prop="errorCode">
+            <el-input v-model="form.errorCode" placeholder="请输入推送结果" />
+          </el-form-item>
+        </div>
+        <div style="display: flex">
+          <el-form-item label="通话时长" prop="phoneDuration">
+            <el-input
+              v-model="form.phoneDuration"
+              placeholder="请输入通话时长"
+            />
+          </el-form-item>
+          <el-form-item label="通话费用" prop="phoneCost">
+            <el-input v-model="form.phoneCost" placeholder="请输入通话费用" />
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
@@ -370,6 +365,13 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "查看电话拨打记录";
+        if (this.form.errorCode == "0") {
+          this.form.errorCode = "成功";
+        } else if (this.form.errorCode == "1") {
+          this.form.errorCode = "失败";
+        } else {
+          this.form.errorCode = "";
+        }
       });
     },
     /** 提交按钮 */

src/views/system/shortMessageSendRecord/index.vue

@@ -105,7 +105,8 @@
       <el-table-column
         label="模板名称"
         align="center"
-        prop="messageTemplateId"
+        prop="template"
+        show-overflow-tooltip
       />
 
       <el-table-column label="短信长度" align="center" prop="messageLength" />
@@ -152,63 +153,69 @@
     />
 
     <!-- 添加或修改短信发送结果记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="患者手机号" prop="patientPhone">
-          <el-input
-            v-model="form.patientPhone"
-            placeholder="请输入患者手机号"
-          />
-        </el-form-item>
-        <el-form-item label="消息发送时间" prop="sendTime">
-          <el-date-picker
-            clearable
-            v-model="form.sendTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择消息发送时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="模板名称" prop="messageTemplateId">
-          <el-input
-            v-model="form.messageTemplateId"
-            placeholder="请输入模板名称"
-          />
+        <div style="display: flex">
+          <el-form-item label="患者手机号" prop="patientPhone">
+            <el-input
+              v-model="form.patientPhone"
+              placeholder="请输入患者手机号"
+            />
+          </el-form-item>
+          <el-form-item label="消息发送时间" prop="sendTime">
+            <el-date-picker
+              clearable
+              v-model="form.sendTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择消息发送时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
+        <el-form-item label="模板名称" prop="template">
+          <el-input v-model="form.template" placeholder="请输入模板名称" />
         </el-form-item>
         <el-form-item label="消息内容">
           <editor v-model="form.messageNodeContent" :min-height="192" />
         </el-form-item>
-        <el-form-item label="推送结果状态码" prop="errorCode">
-          <el-input
-            v-model="form.errorCode"
-            placeholder="请输入推送结果状态码"
-          />
-        </el-form-item>
-        <el-form-item label="短信长度" prop="messageLength">
-          <el-input v-model="form.messageLength" placeholder="请输入短信长度" />
-        </el-form-item>
-        <el-form-item label="短信数量" prop="messageQuantity">
-          <el-input
-            v-model="form.messageQuantity"
-            placeholder="请输入短信数量"
-          />
-        </el-form-item>
-        <el-form-item label="短信单价" prop="messageUnitPrice">
-          <el-input
-            v-model="form.messageUnitPrice"
-            placeholder="请输入短信单价"
-          />
-        </el-form-item>
-        <el-form-item label="短信价格" prop="messagePrice">
-          <el-input
-            v-model="form.messageExpense"
-            placeholder="请输入短信价格"
-          />
-        </el-form-item>
-        <el-form-item label="关联账单id" prop="billId">
-          <el-input v-model="form.billId" placeholder="请输入关联账单id" />
-        </el-form-item>
+        <div style="display: flex">
+          <el-form-item label="推送结果" prop="errorCode">
+            <el-input v-model="form.errorCode" placeholder="请输入推送" />
+          </el-form-item>
+
+          <el-form-item label="短信长度" prop="messageLength">
+            <el-input
+              v-model="form.messageLength"
+              placeholder="请输入短信长度"
+            />
+          </el-form-item>
+        </div>
+        <div style="display: flex">
+          <el-form-item label="短信数量" prop="messageQuantity">
+            <el-input
+              v-model="form.messageQuantity"
+              placeholder="请输入短信数量"
+            />
+          </el-form-item>
+          <el-form-item label="短信单价" prop="messageUnitPrice">
+            <el-input
+              v-model="form.messageUnitPrice"
+              placeholder="请输入短信单价"
+            />
+          </el-form-item>
+        </div>
+        <div style="display: flex">
+          <el-form-item label="短信价格" prop="messagePrice">
+            <el-input
+              v-model="form.messageExpense"
+              placeholder="请输入短信价格"
+            />
+          </el-form-item>
+          <el-form-item label="关联账单id" prop="billId">
+            <el-input v-model="form.billId" placeholder="请输入关联账单id" />
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
@@ -340,6 +347,13 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "查看短信发送结果记录";
+        if (this.form.errorCode == "0") {
+          this.form.errorCode = "成功";
+        } else if (this.form.errorCode == "1") {
+          this.form.errorCode = "失败";
+        } else {
+          this.form.errorCode = "";
+        }
       });
     },
     /** 提交按钮 */