소스 검색

Revert "默认消息类型"

This reverts commit 31cb034d68e9156da945ee120fdef0cdd2444eef.
lupeng 1 년 전
부모
커밋
147bd07148
3개의 변경된 파일6개의 추가작업 그리고 17개의 파일을 삭제
  1. 1 1
      src/views/plan/finishProduct/index.vue
  2. 2 4
      src/views/system/logs/index.vue
  3. 3 12
      src/views/system/message/index.vue

+ 1 - 1
src/views/plan/finishProduct/index.vue

@@ -150,7 +150,7 @@ option.value = Object.assign(option.value, {
 
     },
     { label: "完工时间", prop: "updated", overHidden: true,
-      disabled:true, },
+      disabled:true, hide:true},
     {
       label: "物料数量",
       prop: "completeNum",

+ 2 - 4
src/views/system/logs/index.vue

@@ -309,8 +309,7 @@ const handleLoginQuery = (params: any, done: any) => {
   const querySearch = {
     pageSize: pageLogin.value.pageSize,
     pageNo: pageLogin.value.currentPage,
-    state: searchLogin.value.state === '' ? null : searchLogin.value.state,
-    creator: searchLogin.value.creator === '' ? null : searchLogin.value.creator,
+    ...params,
   };
   getLoginLogPage(querySearch)
     .then(({ data }) => {
@@ -372,8 +371,7 @@ const handleOperQuery = (params: any, done: any) => {
   const querySearch = {
     pageSize: page.value.pageSize,
     pageNo: page.value.currentPage,
-    creator: search.value.creator === '' ? null : search.value.creator,
-    operatorType: search.value.operatorType === '' ? null : search.value.operatorType,
+    ...params,
   };
   getOperaLogPage(querySearch)
     .then(({ data }) => {

+ 3 - 12
src/views/system/message/index.vue

@@ -40,16 +40,8 @@
             link
             v-if="row.state === '0'"
             size="small"
-            @click="handleSend(row,1)"
-        ><i-ep-edit />发送
-        </el-button>
-        <el-button
-            type="primary"
-            link
-            v-if="row.state === '1'"
-            size="small"
             @click="handleSend(row,0)"
-        ><i-ep-edit />撤销
+        ><i-ep-edit />发送
         </el-button>
       </template>
     </avue-crud>
@@ -179,14 +171,13 @@ const handleEdit =(row,index)=>{
   dialog.visible = true
 }
 const handleSend =(row,index)=>{
-  let msg = index === 0 ? '撤销' : '发送'
-  ElMessageBox.confirm("确定要"+msg+"吗?", "提示", {
+  ElMessageBox.confirm("确定要发送吗?", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
     lockScroll: false,
   }).then(() => {
-    row.state = index
+    row.state = 1
     updateMessage(row).then((data)=>{
       if(data.code === '200'){
         ElMessage.success(data.msg)