提交代码

build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-// let devModules = ['index', 'statisticalReport', 'queue']
+//let devModules = ['index', 'statisticalReport', 'queue','appoint','sale','TMS','RMS']
 let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {

src/components/main.vue

@@ -2667,17 +2667,17 @@ export default {
             }else{
               console.log("进入了标记不为0")
               this.badgeshow=false
-              if(this.$store.state.index==1){
-                let data={
-                  noticetitle:this.noticedata[0].noticetitle,
-                  noticecontent:this.noticedata[0].noticecontent,
-                  insertusername:this.noticedata[0].insertusername,
-                  inserttime:this.noticedata[0].inserttime,
-                  noticeid:this.noticedata[0].noticeId
-                }
-                this.noticedata1=data
-                this.centerDialogVisible=true;
-              }
+              // if(this.$store.state.index==1){
+              //   let data={
+              //     noticetitle:this.noticedata[0].noticetitle,
+              //     noticecontent:this.noticedata[0].noticecontent,
+              //     insertusername:this.noticedata[0].insertusername,
+              //     inserttime:this.noticedata[0].inserttime,
+              //     noticeid:this.noticedata[0].noticeId
+              //   }
+              //   this.noticedata1=data
+              //   this.centerDialogVisible=true;
+              // }
             }
           } else {
             console.log('进入了标记值为null的值')

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -846,7 +846,6 @@ export default {
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (
         columnIndex === 0 ||
-        columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
         columnIndex === 4 ||
@@ -868,7 +867,6 @@ export default {
     objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
       if (
         columnIndex === 0 ||
-        columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
         columnIndex === 4 ||