From eda46bf83619297600436e5015fd8977e9974219 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 04 十一月 2022 15:50:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/sms/smsIndex/index.vue |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index e753649..c8dd445 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -11,19 +11,19 @@
                     <el-input placeholder="娑堟伅鏍囬" v-model="context"></el-input>
                 </div>
                 <div class="message-status">
-                    <span>娑堟伅鐘舵��:</span>
-                    <el-select v-model="messageStatus" placeholder="璇烽�夋嫨娑堟伅鐘舵��">
+                    <span>鐭俊鍥炴墽:</span>
+                    <el-select v-model="messageStatus" placeholder="璇烽�夋嫨">
                         <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </div>
-                <div class="message-kind">
+                <!-- <div class="message-kind">
                     <span>娑堟伅鍒嗙被:</span>
                     <el-select v-model="messageKind" placeholder="璇烽�夋嫨娑堟伅鍒嗙被">
                         <el-option v-for="item in kindList" :key="item.id" :label="item.columnName" :value="item.id">
                         </el-option>
                     </el-select>
-                </div>
+                </div> -->
                 <div class="find">
                     <el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
                     <el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button>
@@ -48,40 +48,33 @@
                     </el-table-column>
                     <el-table-column prop="head" label="鏍囬" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="updateTime" label="淇敼鏃堕棿" min-width="10">
+                    <el-table-column prop="updateTime" label="鍙戦�佹椂闂�" min-width="10">
                         <template slot-scope="scope">
                             <span>{{changeTime(scope.row)}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="targetFrom" label="鍙戝竷浜哄憳" min-width="15">
-                    </el-table-column>
-                    <el-table-column prop="channelCode" label="娑堟伅鍒嗙被" min-width="10">
-                        <template slot-scope="scope">
-                            <span>{{scope.row.channelCode === '01' ? '绔欏唴淇�':scope.row.channelCode
-                            ==='02'?"閭欢":'鐭俊'}}</span>
-                        </template>
+                    <el-table-column prop="targetFrom" label="鍙戦�佽处鍙�" min-width="15">
                     </el-table-column>
                     <el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
                         <template slot-scope="scope">
-                            {{scope.row.status === 0 ? '鏈彂甯�' :'宸插彂甯�'}}
+                            {{scope.row.status === 0 ? '鍙戦�佸け璐�' :'鍙戦�佹垚鍔�'}}
                         </template>
                     </el-table-column>
                     <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
                         <template slot-scope="scope">
                             <div class="operation">
-                                <el-link icon="el-icon-view" :underline="false" @click="handleView(scope.row)">鏌ョ湅</el-link>
-                                <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">缂栬緫</el-link>
                                 <el-link class="leftPx" icon="el-icon-delete-solid" :underline="false"
                                     @click="handleDelete([scope.row.id])">鍒犻櫎</el-link>
+                                <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">閲嶆柊鍙戦��</el-link>
                             </div>
                         </template>
                     </el-table-column>
                 </el-table>
                 <!-- 鏂板缓娑堟伅 -->
-                <!-- <el-dialog title="鏂板缓娑堟伅" :visible.sync="dialogCreate" v-if="dialogCreate" width="80%"
+                <el-dialog title="鏂板缓娑堟伅" :visible.sync="dialogCreate" v-if="dialogCreate" width="80%"
                     :before-close="handleConfirmClose">
                     <MyCreate @closeMyDialog="closeDialog"></MyCreate>
-                </el-dialog> -->
+                </el-dialog>
                 <!-- 娑堟伅璇︽儏 -->
                 <!-- <el-dialog title="娑堟伅璇︽儏" :visible.sync="dialogView" v-if="dialogView" width="45%"
                     :before-close="handleClose">
@@ -121,9 +114,11 @@
     </div>
 </template>
 <script>
+import helper from '@/utils/mydate'
+import MyCreate from './createSms'
 export default {
     components: {
-        // MyView, MyCreate,MyEdit
+         MyCreate
     },
     data() {
         return {
@@ -167,11 +162,11 @@
                     value: 2,
                 },
                 {
-                    label: '鏈彂甯�',
+                    label: '鍙戦�佸け璐�',
                     value: 0,
                 },
                 {
-                    label: '宸插彂甯�',
+                    label: '鍙戦�佹垚鍔�',
                     value: 1,
                 }
             ],
@@ -257,7 +252,7 @@
                 url: 'sccg/message/list',
                 data: {
                     body: "",
-                    channelCode: messageKind === '00' ?'':messageKind,
+                    channelCode: '03',
                     createUser: '',
                     current: currentPage,
                     head: context,

--
Gitblit v1.8.0