Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/components/RightPanel/index.vue

@@ -5,7 +5,7 @@
       <!-- <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show"> :theme -->
       <div class="handle-button" type="success"  :style="{'top':buttonTop+'px','background-color':buttonbgc}" @click="rightClick">
         <!-- <i :class="show?'el-icon-close':'el-icon-setting'" /> -->
-         <i :class="show?'el-icon-caret-left':'el-icon-caret-right'" />
+         <i :class="show?'el-icon-caret-right':'el-icon-caret-left'" />
       </div>
       <div class="rightPanel-items">
         <slot />

shanXiPlatform/src/views/home/daiBan/pending/xunzengDetails.vue

@@ -227,20 +227,22 @@ export default {
       }
       Approval(data)
         .then((res) => {
-          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
-          // location.reload();
-
-          this.$store.commit({
-            type: "changependingCount",
-            pendingCount: this.$store.state.pendingCount,
-          })
-
-          this.getCheckList()
-          this.getPending()
-          // this.$router.push({
-          //   path: "/dashboard/daiban/pending/xunzengDetails",
-          //   item: this.$route.query,
-          // })
+          if(res.code == 200){
+            sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+            // location.reload();
+            this.$store.commit({
+              type: "changependingCount",
+              pendingCount: this.$store.state.pendingCount,
+            })
+            this.getCheckList()
+            this.getPending()
+            // this.$router.push({
+            //   path: "/dashboard/daiban/pending/xunzengDetails",
+            //   item: this.$route.query,
+            // })
+          }else{
+            this.$message({message:res.msg,type: 'error'})
+          }
         })
         .catch((err) => {
           console.log(err)
@@ -257,20 +259,23 @@ export default {
       }
       yjcgApproval(data)
         .then((res) => {
-          sessionStorage.setItem("store", JSON.stringify(this.$store.state))
-          // location.reload();
-
-          this.$store.commit({
-            type: "changependingCount",
-            pendingCount: this.$store.state.pendingCount,
-          })
-
-          this.getCheckList()
-          this.getPending()
-          this.$router.push({
-            path: "/dashboard/daiban/pending/xunzengDetails",
-            item: this.$route.query,
-          })
+          if(res.code == 200){
+            sessionStorage.setItem("store", JSON.stringify(this.$store.state))
+            // location.reload();
+            this.$store.commit({
+              type: "changependingCount",
+              pendingCount: this.$store.state.pendingCount,
+            })
+            this.getCheckList()
+            this.getPending()
+            // this.$router.push({
+            //   path: "/dashboard/daiban/pending/xunzengDetails",
+            //   item: this.$route.query,
+            // })
+          }else{
+            this.$message({message:res.msg,type: 'error'})
+          }
+          
         }) 
         .catch((err) => {
           console.log(err)

shanXiPlatform/src/views/home/daiBan/processed/index.vue

@@ -44,17 +44,17 @@
           <div class="applyTime" v-if="item.type.indexOf('code') == -1">{{ item.applyTime }}</div>
           <div class="applyTime" v-if="item.type.indexOf('code') == -1">{{ item.startDate }}</div>
           <!-- 粮情 -->
-          <span
+          <!-- <span
             style="color: #037d41"
             @click="goDetails(item)"
             v-if="item.auditState == 4 && item.type.indexOf('code') != -1"
             >已处理</span
-          >
+          > -->
           <!-- 机械通风 -->
           <span
             @click="goDetails(item)"
-            v-if="item.auditState == 0 && item.type.indexOf('code') == -1"
-            >待审批</span
+            v-if="(item.auditState == 0 || item.auditState == 1) && item.type.indexOf('code') == -1"
+            >审批中</span
           >
           <!-- <el-button
             type="success"
@@ -67,7 +67,7 @@
           <span
             style="color: #037d41"
             @click="goDetails(item)"
-            v-else-if="item.auditState == 1 &&item.type.indexOf('code') == -1"
+            v-else-if="(item.auditState == 3 || item.auditState == 4) &&item.type.indexOf('code') == -1"
             >审批通过</span
           >
           <!-- <el-button
@@ -92,12 +92,12 @@
             v-else-if="item.auditState == 2"
             >审批不通过</el-button
           > -->
-          <span
+          <!-- <span
             style="color: #037d41"
             @click="goDetails(item)"
             v-else-if="item.auditState == 3 && item.type.indexOf('code') == -1"
             >审批通过</span
-          >
+          > -->
           <!-- <el-button
             type="success"
             plain
@@ -106,12 +106,12 @@
             v-else-if="item.auditState == 3"
             >进行中</el-button
           > -->
-          <span
+          <!-- <span
             style="color: #037d41"
             @click="goDetails(item)"
             v-if="item.auditState == 4 && item.type.indexOf('code') == -1"
             >审批通过</span
-          >
+          > -->
           <!-- <el-button
             type="success"
             plain

shanXiPlatform/src/views/reservesManagement/fumigationManagement/steps.vue

@@ -524,7 +524,7 @@ export default {
                 this.processActive = i
               }
               this.process.push(ele)
-            }
+            }  
             if (this.process[0].content == 0) {
               this.process[0].content = this.userInfo.uid
             } else {
@@ -552,7 +552,7 @@ export default {
         type = "xzsq"
       }
       let ongoingStepNum = null
-      if(this.stepActive < 4){
+      if(this.stepActive < 4 && this.button !== "暂存"){
         ongoingStepNum = this.stepActive + 1
       }else{
         ongoingStepNum = this.stepActive
@@ -567,9 +567,23 @@ export default {
       updateList(data).then((res) => {
         if (res.code == 200) {
           this.loading=false;
-          this.$router.push({
-            path: "/reservesManagement/fumigationManagement",
-          })
+          if(this.button == "保存"){
+            this.stepActive = this.stepActive + 1
+            this.processId = this.$route.query.processId
+            this.step = this.stepActive + 1
+            this.totalData = [] 
+            this.tableData = []   
+            this.process = [] 
+            this.subList = []
+            this.getCheckList()
+          }else{
+            this.$router.push({
+              path: "/reservesManagement/fumigationManagement",
+            })
+          }
+          // this.$router.push({
+          //     path: "/reservesManagement/fumigationManagement",
+          //   })
         }
       })
     },

shanXiPlatform/src/views/systemManagement/userManagement/approverManagement/index.vue

@@ -524,9 +524,11 @@ export default {
                 depotId: this.depotId,
                 roleIds: this.rolesId
             }
+            let resData = []
             roleList(params)
                 .then(res => {
                     if (res.code == 200) {
+                        resData = res.data
                         this.tableData.forEach(item => {
                             if (item.title.indexOf("主管科长") != -1) {
                                 this.$set(item, "approverSelect", res.data[33])
@@ -536,10 +538,6 @@ export default {
                                 this.$set(item, "approverSelect", res.data[35])
                             } else if (item.title.indexOf("总经理") != -1) {
                                 this.$set(item, "approverSelect", res.data[34])
-                            } else if (
-                                item.title.indexOf("分公司主管处室") != -1
-                            ) {
-                                this.$set(item, "approverSelect", res.data[37])
                             }
                         })
                     }
@@ -547,6 +545,31 @@ export default {
                 .catch(err => {
                     console.log(err)
                 })
+            if(this.type == 'xzjh' || this.type == 'yjcg'){
+                let paramsNew = {
+                    depotId: 1,
+                    roleIds: 37
+                }
+                roleList(paramsNew)
+                    .then(res => {
+                        if (res.code == 200) {
+                            this.tableData.forEach(item => {
+                                if ( item.title.indexOf("分公司主管处室") != -1 ) {
+                                    this.$set(item, "approverSelect", res.data[37])
+                                }
+                            })
+                        }
+                    })
+                    .catch(err => {
+                        console.log(err)
+                    })
+            }else{
+                this.tableData.forEach(item => {
+                    if ( item.title.indexOf("分公司主管处室") != -1 ) {
+                        this.$set(item, "approverSelect", resData[37])
+                    }
+                })
+            }
         },
         // 头部下拉选的值发生改变时
         headChange() {

shanXiPlatform/src/views/systemManagement/userManagement/roleManagement/index.vue

@@ -39,7 +39,7 @@
           <el-button
             size="mini"
              type="dangerbtn"
-            v-if="scope.row.rid !== 35 && scope.row.rid !== 33 && scope.row.rid !== 30"
+            v-if="scope.row.rid !== 35 && scope.row.rid !== 33 && scope.row.rid !== 30 && scope.row.rid !== 37"
             @click="handleDelete(scope.$index, scope.row)"
             class="deleteBtn"
           >删除</el-button>  

shanXiPlatform/src/views/systemManagement/userManagement/userManagement/addUser.vue

@@ -582,8 +582,7 @@ export default {
             // roleIds: this.copyUser.roleIds,
             // storehouseIds: this.copyUser.storehouseIds,
             // storehouseNames: this.copyUser.storehouseNames,
-            uId: this.copyUser.uid,
-            // uName: this.copyUser.uName,
+            uId: this.user.uId,
             // ustatus: this.copyUser.ustatus,
             uPassword: this.formPassword.uPassword
           }