chrislee 11 月之前
父節點
當前提交
f16253f352
共有 3 個文件被更改,包括 23 次插入23 次删除
  1. 18 18
      src/views/main-navbar-notify-type.vue
  2. 4 4
      src/views/main-navbar.vue
  3. 1 1
      src/views/modules/production/scheduling.vue

+ 18 - 18
src/views/main-navbar-notify-type.vue

@@ -6,10 +6,10 @@
     <el-form :model="dataForm" ref="dataForm"  label-width="0px">
       <el-form-item label="">
         <el-checkbox-group v-model="checkTypes">
-            <el-checkbox :disabled="item.value == 'system'" :label="item.value"  :key="item.value" v-for="item in types">{{item.name}}</el-checkbox>
+            <el-checkbox :disabled="item.value === 'system'" :label="item.value"  :key="item.value" v-for="item in types">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-     
+
     </el-form>
     <span slot="footer">
       <el-button @click="visible = false">取消</el-button>
@@ -20,25 +20,25 @@
 
 <script>
   import { getMyInfo } from '@/api/my'
-  import { clearLoginInfo } from '@/utils'
+
   export default {
     data () {
       return {
         visible: false,
         dataForm: {},
-        userInfo:{},
+        userInfo: {},
         types: [{
-					value: 'system',
-					name: '系统消息',
-					disabled: true
-				}, {
-					value: 'message',
-					name: '短信消息'
-				}, {
-					value: 'weChat',
-					name: '微信消息'
-				}],
-        checkTypes:['system']
+          value: 'system',
+          name: '系统消息',
+          disabled: true
+        }, {
+          value: 'message',
+          name: '短信消息'
+        }, {
+          value: 'weChat',
+          name: '微信消息'
+        }],
+        checkTypes: ['system']
       }
     },
     computed: {
@@ -51,8 +51,8 @@
         getMyInfo().then(({data}) => {
           if (data && data.code === '200' && data.data) {
             this.userInfo = data.data
-            if(this.userInfo.userEntity.notifyType){
-            this.checkTypes = this.userInfo.userEntity.notifyType.split(",")
+            if (this.userInfo.userEntity.notifyType) {
+              this.checkTypes = this.userInfo.userEntity.notifyType.split(',')
             }
           }
         })
@@ -65,7 +65,7 @@
               url: this.$http.adornUrl('/biz-service/personal/notifyType/save'),
               method: 'post',
               data: this.$http.adornData({
-                'notifyType': this.checkTypes.join(","),
+                'notifyType': this.checkTypes.join(','),
                 'userId': ''
               })
             }).then(({data}) => {

+ 4 - 4
src/views/main-navbar.vue

@@ -2,8 +2,8 @@
   <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
     <div class="site-navbar__header">
       <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
-        <a class="site-navbar__brand-lg" href="javascript:;">木之云平台</a>
-        <a class="site-navbar__brand-mini" href="javascript:;">木之云</a>
+        <a class="site-navbar__brand-lg" href="javascript:">木之云平台</a>
+        <a class="site-navbar__brand-mini" href="javascript:">木之云</a>
       </h1>
     </div>
     <div class="site-navbar__body clearfix">
@@ -112,8 +112,8 @@ export default {
       }
     },
     methods: {
-      //消息设置
-      notifyTypeHandle(){
+      // 消息设置
+      notifyTypeHandle () {
         this.notifyTypeVisible = true
         this.$nextTick(() => {
           this.$refs.notifyType.init()

+ 1 - 1
src/views/modules/production/scheduling.vue

@@ -1,7 +1,7 @@
 <!-- 任务处理中心 -->
 <template>
   <div class="production">
-    <template v-if="!detailsVisible && !outsourceVisible && !checkVisible && !preCheckVisible && !purchaseVisible">
+    <template v-if="!detailsVisible && !outsourceVisible && !checkVisible && !preCheckVisible && !purchaseVisible && !printLabelVisible">
       <el-header style="font-size: large;text-align: center">任务处理中心</el-header>
       <el-table
         :data="dataList"