1

shanXiPlatform/src/api/branchoff/index.js

@@ -29,6 +29,7 @@ export function  getpointll(homeType , depotId) {
     method: 'get'
   })
 }
+//异常粮情省图的table
 export function  getyclq( data  ) {
   return request({              
     url: `/csc-szls-business/grainConditionRecord/authority/getGrainErrorCount`,
@@ -36,6 +37,15 @@ export function  getyclq( data  ) {
     data : data
   })
 }
+//异常粮情库图的table
+export function  getyclqk( data  ) {
+  return request({              
+    url: `/csc-szls-business/grainConditionRecord/authority/getGrainErrorHouseList`,
+    method: 'post',
+    data : data
+  })
+}
+
 //异常粮情折线图
 export function  getzxt( depotId) {
   return request({

shanXiPlatform/src/api/grainCheck/index.js

@@ -11,14 +11,22 @@ export function getNewGrainInfo(data) {
   }
 
 //  获取最全粮情信息
-export function getAllPages(data) {
+/* export function getAllPages(data) {
     return request({
       url: `csc-szls-business/grainConditionRecord/authority/getPage`,
       method: 'post',
       data
+
     })
-  }
+  } */
+  export function getAllPages(params) {
+    return request({
+      url: `csc-szls-business/grainConditionRecord/authority/getPage`,
+      method: 'get',
+      params
 
+    })
+  }
 // 新增时初始化页面数据
 export function getAddInfo(data) {
   return request({
@@ -38,11 +46,11 @@ export function addInfo(data) {
 }
 
   //查询
-export function queryGrainInfo(data) {
+export function queryGrainInfo(params) {
   return request({
     url: `csc-szls-business/grainConditionRecord/authority/getPage`,
-    method: 'post',
-    data
+    method: 'get',
+    params
   })
 }
 
@@ -51,7 +59,7 @@ export function queryGrainInfo(data) {
 //删除
 export function deleteGrainInfo(id) {
   return request({
-    url: `csc-szls-business/grainConditionRecord/authority_button/deleteById/${id}`,
+    url: `csc-szls-business/grainConditionRecord/authority/deleteById/${id}`,
     method: 'delete',
     // id
   })
@@ -60,6 +68,7 @@ export function deleteGrainInfo(id) {
 //修改
 export function editGrainInfo(data) {
   return request({
+    // url: `csc-szls-business/grainConditionRecord/authority_button/update`,
     url: `csc-szls-business/grainConditionRecord/authority_button/update`,
     method: 'post',
     data
@@ -69,11 +78,12 @@ export function editGrainInfo(data) {
 //查看
 export function checkGrainInfo(id) {
   return request({
-    url: `csc-szls-business/grainConditionRecord/authority/getById/${id}`,
+    url: `csc-szls-business/grainRecordChild/authority/getById/${id}`,
     method: 'get'
   })
 }
 
+
 //处理待办项
 export function haveDone(id,auditState) {
   return request({
@@ -88,7 +98,23 @@ export function haveDone1(userId,type,depotId,houseId,auditState) {
     method: 'get'
   })
 }
-//
+
+// 重构 --- 字典表查询(根据parentId查询)
+export function getGrainItems(parentId) {
+  return request({
+    // url: `/csc-szls-system-manage/basicsEnum/authority/getEnumAll`,
+    url: `/csc-szls-system-manage/basicsEnum/authority/getOnlyChildData/${parentId}`,
+    method: 'get',
+  })
+}
+
+//查询所有字典项 /basicsEnum/authority/getEnumAll
+export function getGrainAll() {
+  return request({
+     url: `/csc-szls-system-manage/basicsEnum/authority/getEnumAll`,
+    method: 'get',
+  })
+}
 //获取当前时间
 export function getDateTimeNow(){
   var time = new Date();
@@ -97,9 +123,9 @@ export function getDateTimeNow(){
 
   var hour = ("0" + time.getHours()).slice(-2)
   var minute = ("0" + time.getMinutes()).slice(-2)
-  // var second = ("0" + time.getSeconds()).slice(-2)
+  var second = ("0" + time.getSeconds()).slice(-2)
 
-  var today = time.getFullYear() + "-" + (month) + "-" + (day) + " " + (hour) + ":" + (minute)
+  var today = time.getFullYear() + "-" + (month) + "-" + (day) + " " + (hour) + ":" + (minute)+ ":" + (second)
   return today
 }
 

shanXiPlatform/src/api/sendMessageSocket.js

@@ -21,7 +21,7 @@ export function newWebSocket(uId,isclear){
     }
     // 判断当前环境是否支持websocket
     if(!isclear){
-        console.log('开始连接websocket')
+        // console.log('开始连接websocket')
         window.websocketmessage = null;
         if(window.WebSocket){
             if(!window.websocketmessage){
@@ -33,7 +33,7 @@ export function newWebSocket(uId,isclear){
             console.log("not support websocket");
         }
     }
- 
+
     // 连接成功建立的回调方法
     window.websocketmessage.onopen = function(e){
         heartCheck.reset().start();   // 成功建立连接后，重置心跳检测
@@ -41,7 +41,7 @@ export function newWebSocket(uId,isclear){
     }
     // 连接发生错误，连接错误时会继续尝试发起连接（尝试5次）
     window.websocketmessage.onerror = function() {
-        console.log("onerror连接发生错误")
+        // console.log("onerror连接发生错误")
         websocket_connected_count++;
         // if(websocket_connected_count <= 5){
         //     newWebSocket(uId)
@@ -79,22 +79,22 @@ export function newWebSocket(uId,isclear){
                     messageData: JSON.stringify(messageData)
                 })
             }
-            
+
             // console.log('mymy',store.state.messageData)
            //执行接收到消息的操作，一般是刷新ＵＩ
         }
     }
- 
+
     // 接受到服务端关闭连接时的回调方法
     window.websocketmessage.onclose = function(){
-        console.log("onclose断开连接");
-        console.log(window.websocketmessage)
+        // console.log("onclose断开连接");
+        // console.log(window.websocketmessage)
     }
     // 监听窗口事件，当窗口关闭时，主动断开websocket连接，防止连接没断开就关闭窗口，server端报错
     window.onbeforeunload = function(){
         window.websocketmessage.close();
     }
- 
+
     // 心跳检测, 每隔一段时间检测连接状态，如果处于连接中，就向server端主动发送消息，来重置server端与客户端的最大连接时间，如果已经断开了，发起重连。
     var heartCheck = {
         timeout: 56*60*1000,        // 56分钟发一次心跳，比server端设置的连接时间稍微小一点，在接近断开的情况下以通信的方式去重置连接时间。
@@ -112,7 +112,7 @@ export function newWebSocket(uId,isclear){
                     if(window.websocketmessage.readyState == 1){
                         // window.websocketmessage.send("ping");
                         console.log("心跳检测结果: 连接状态正常");
-                        heartCheck.reset().start();    
+                        heartCheck.reset().start();
                     }else{
                         console.log('getuser',getUser())
                         if(getUser()){
@@ -147,4 +147,4 @@ export function removeSession(id) {
       url: `/csc-szls-message/sysMessage/authority/removeSession/${id}`,
       method: 'get',
     })
-}
+}

shanXiPlatform/src/layoutt/index.vue

@@ -42,6 +42,7 @@
       <span class="myspan">当前所在位置: 首页></span>
       <span class="myspan" v-if="this.$store.state.isshowLibrary && this.$route.query.midprovinceName == '山西省'">山西省></span>
       <span class="myspan" v-if="this.$store.state.isshowLibrary && this.$route.query.midprovinceName == ''">{{this.$store.state.depotName}}></span>
+      <span class="myspan" v-if="this.$store.state.isshowLibrary && this.$route.query.midprovinceName != '' && this.$route.query.midprovinceName != '山西省'">{{this.$route.query.midprovinceName}}></span>
       <breadcrumb id="breadcrumb-container" style="height:54px;line-height:54px; " class="breadcrumb-container" />
     </div>
     <app-main></app-main>

shanXiPlatform/src/router/index.js

@@ -348,6 +348,14 @@ export const constantRoutes = [
         meta: { title: '异常粮情', icon: 'dashboard',isshowLibrary:true, affix: true },
       },
       {
+        path: 'cnyclqtable',
+        component: () => import('@/views/home/cnyclqtable'),
+        name: 'cnyclqtable',
+        hidden: true,
+        meta: { title: '粮情检查', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
+      
+      {
         path: 'gzjftable',
         component: () => import('@/views/home/gzjftable'),
         name: 'gzjftable',

shanXiPlatform/src/views/home/cnyclqtable.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="global">
+        <div class="contentContainerGg">
+            <div class="container">
+                <el-form :inline="true">
+                    <el-form-item label="时间:">
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="week" format="yyyy年WW周" placeholder="选择周">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
+                            查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
+                    <el-table-column property="depotName" label="时间" align="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.yearJoinWeek}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="depotName" label="仓房" align="center">
+                        <template slot-scope="scope">
+                            <span style="color:green;" @click="houseclick(scope.$index, scope.row)"> {{ hourseDic[scope.row.houseId] }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="depotName" label="所属公司" align="center">
+                        <template slot-scope="scope">
+                            {{ depotDic[scope.row.depotId] }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="粮情异常情况" align="center">
+                        <template slot-scope="scope">
+                            <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
+                                <span class='colorspano' v-if="scope.row.grainError == '191'"></span>
+                                <span class='colorspant' v-if="scope.row.grainError != '191'"></span>
+                            </p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="operation" label="操作" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row )">详情</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="pagination-container">
+                    <el-pagination class="right" background :current-page.sync="listQuery.page" :page-size="listQuery.limit" :page-sizes="[10,20,30,40]" :total="total" @size-change="sizeChange" @current-change="pageChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+import { getyclqk } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: [],
+            checkYear: "",
+            checkYearWeek: "",
+            condition: {}
+        }
+    },
+    created() {
+        this.condition = {
+            depotId: this.$route.query.depotId
+        }
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
+        this.hourseDic = JSON.parse(localStorage.getItem("hourseDic"))
+    },
+    methods: {
+        houseclick(index, row) {
+            this.$store.commit({
+                type: "changeDepotId",
+                depotId: row.depotId
+            })
+            this.$store.commit({
+                type: "changeHouseId",
+                houseId: row.houseId
+            })
+            this.$store.commit({
+                type: "changeHouseName",
+                houseName: this.hourseDic[row.houseId]
+            })
+            this.$store.commit({
+                type: "changeDepotName",
+                depotName: this.depotDic[row.depotId]
+            })
+            this.$router.push("/countQuality/warehouseInformation")
+        },
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                if (week == "") {
+                    this.condition = {
+                        depotId: this.$route.query.depotId
+                    }
+                    return
+                }
+                console.log(week, "weekweek")
+                this.checkYear = week.slice(0, 4)
+                this.checkYearWeek = week.slice(5, 7)
+                this.condition = {
+                    depotId: this.$route.query.depotId,
+                    checkYear: this.checkYear,
+                    checkYearWeek: this.checkYearWeek
+                }
+            })
+        },
+        getList() {
+            var condition = JSON.stringify(this.condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getyclqk(data)
+                .then(res => {
+                    if (res.code == 200) {
+                        this.tableList = res.data.records
+                        this.listQuery.limit = res.data.size
+                        this.total = res.data.total
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: res.msg
+                        })
+                    }
+                })
+                .catch(err => {
+                    console.log(err)
+                })
+        },
+        sizeChange(v) {
+            this.listQuery.limit = v
+            this.getList()
+        },
+        pageChange(v) {
+            this.listQuery.page = v
+            this.getList()
+        },
+        detailbtn(index, row) {
+            this.$store.commit({
+                type: "changeDepotId",
+                depotId: row.depotId
+            })
+            this.$store.commit({
+                type: "changeHouseId",
+                houseId: row.houseId
+            })
+            this.$store.commit({
+                type: "changeHouseName",
+                houseName: this.hourseDic[row.houseId]
+            })
+            this.$store.commit({
+                type: "changeDepotName",
+                depotName: this.depotDic[row.depotId]
+            })
+            this.$router.push({
+                name: "AllGrain"
+            })
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.top {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+}
+.container {
+    padding: 10px;
+}
+.pagination-container {
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
+}
+.colorspano {
+    width: 140px;
+    height: 30px;
+    background-color: #199856;
+    display: inline-block;
+    border-radius: 5px;
+}
+.colorspant {
+    width: 140px;
+    height: 30px;
+    background-color: #ffff00;
+    display: inline-block;
+    border-radius: 5px;
+}
+</style>

shanXiPlatform/src/views/home/storageStatusTable.vue

@@ -97,4 +97,4 @@ export default {
     margin-right: 20px;
     text-align: right;
 }
-</style>
+</style>

shanXiPlatform/src/views/home/yclqtable.vue

@@ -13,32 +13,18 @@
                     </el-form-item>
                 </el-form>
                 <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
-                    <!-- <el-table-column prop="operationTime" label="时间" align="center" /> -->
                     <el-table-column property="depotName" label="时间" align="center">
                         <template slot-scope="scope">
-                            {{ scope.row.checkYear }}年 {{ scope.row.checkYearWeek}}周
+                            {{ scope.row.yearJoinWeek}}
                         </template>
                     </el-table-column>
-                    <el-table-column v-if="this.$route.query.isshow" property="depotName" label="仓房" align="center">
+                    <el-table-column property="depotName" label="公司" align="center">
                         <template slot-scope="scope">
-                            <span style="color:green;" > {{ scope.row.depotId }}</span>
+                            {{ depotDic[scope.row.depotId] }}
                         </template>
                     </el-table-column>
-                    <el-table-column  property="depotName" label="公司" align="center">
-                        <template slot-scope="scope" >
-                             {{ depotDic[scope.row.depotId] }} 
-                        </template>
-                    </el-table-column>
-                    <el-table-column v-if="this.$route.query.isshow" label="粮情异常情况" align="center">
-                        <template slot-scope="scope">
-                            <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
-                                <span class='colorspano' v-if="scope.row.grainError == '191'"></span>
-                                <span class='colorspant' v-if="scope.row.grainError != '191'"></span>
-                            </p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column v-if="!this.$route.query.isshow" prop="grainVarieties" label="仓房数量(个)" align="center" />
-                    <el-table-column v-if="!this.$route.query.isshow" prop="warehouseStatus" label="粮情异常仓房数量(个)" align="center" />
+                    <el-table-column  prop="houseCount" label="仓房数量(个)" align="center" />
+                    <el-table-column  prop="grainErrorCount" label="粮情异常仓房数量(个)" align="center" />
                     <el-table-column property="operation" label="操作" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">详情</el-button>
@@ -69,10 +55,16 @@ export default {
                 limit: 10
             },
             roleList: [],
-            depotDic: []
+            depotDic: [],
+            checkYear: "",
+            checkYearWeek: "",
+            condition: {}
         }
     },
     created() {
+        this.condition = {
+            depotId: this.$route.query.depotId
+        }
         this.getList()
         this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
     },
@@ -80,18 +72,24 @@ export default {
         timechange() {
             this.$nextTick(() => {
                 let week = document.querySelector("#getWeek").value
+                if (week == "") {
+                    this.condition = {
+                        depotId: this.$route.query.depotId
+                    }
+                    return
+                }
+                console.log(week, "weekweek")
                 this.checkYear = week.slice(0, 4)
                 this.checkYearWeek = week.slice(5, 7)
+                this.condition = {
+                    depotId: this.$route.query.depotId,
+                    checkYear: this.checkYear,
+                    checkYearWeek: this.checkYearWeek
+                }
             })
         },
         getList() {
-            var condition = {
-                // depotId: this.$store.state.depotId,
-                depotId: this.$route.query.depotId,
-                checkYear: this.checkYear,
-                checkYearWeek: this.checkYearWeek
-            }
-            condition = JSON.stringify(condition)
+            var condition = JSON.stringify(this.condition)
             let data = {
                 condition: condition,
                 pageIndex: this.listQuery.page,
@@ -124,10 +122,10 @@ export default {
         },
         detailbtn(index, row) {
             this.$router.push({
-                name: "AllGrain",
+                name: "cnyclqtable",
                 query: {
-                    // depotId: row.depotId,
-                    // midprovinceName: this.$route.query.midprovinceName
+                    depotId: row.depotId,
+                    midprovinceName: this.depotDic[row.depotId]
                 }
             })
         }

shanXiPlatform/src/views/login/index.vue

@@ -236,7 +236,7 @@ export default {
                   res.data.tokenInfo.access_token
                 setToken(Authorization)
                 setUser(res.data.user)
-                
+
                 this.getDeportDic()
                 this.getHourseDic()
                 this.getPersonDic()
@@ -444,7 +444,7 @@ export default {
     // }
 
     getpermission(homeType){
-     
+
       var userInfo= JSON.parse(localStorage.getItem("userInfo"));
       console.log(userInfo,"当前用户信息")
       var params={
@@ -453,10 +453,10 @@ export default {
       sidebarPermission(params)
       .then(res=>{
         if(res.code == 200){
-         
+
              var permissions = res.data;
              console.log(permissions,"当前用户权限。。。。。。")
-            
+
             localStorage.setItem("permission",JSON.stringify(permissions));
              if (homeType === 1) {
                   // 跳转分公司首页

shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -37,14 +37,21 @@
           ><div class="grid-content bg-purple">
             <div class="top_select">
               <span class="demonstration"> 检查类型: </span>
-              <el-select v-model="check_person" placeholder="请选择">
-                <el-option
+              <el-select v-model="kind" placeholder="请选择">
+                <!-- <el-option
                   v-for="item in options"
                   :key="item.value"
                   :label="item.label"
                   :value="item.label"
                 >
-                </el-option>
+                </el-option> -->
+                <el-option
+              v-for="item in grainKind"
+              :key="item.enumId"
+              :label="item.enumName"
+              :value="item.enumId"
+            >
+            </el-option>
               </el-select>
             </div>
           </div>
@@ -88,8 +95,25 @@
           :index="indexMethod"
         >
         </el-table-column>
-        <el-table-column prop="checkTime" label="记录时间" align="center" />
-        <el-table-column prop="checkPerson" label="检查类型" align="center" />
+        <el-table-column prop="operationTime" label="记录时间" align="center" >
+           <template slot-scope="scope">
+            <span>{{
+              scope.row.operationTime == null
+                ? scope.row.operationTime
+                : scope.row.operationTime.slice(0, 16)
+            }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="enumId" label="检查类型" align="center">
+          <template slot-scope="scope">
+            <p v-for="item in grainKind" :key="item.enumId">
+              <span v-if="scope.row.enumId == item.enumId">{{
+                item.enumName
+              }}</span>
+            </p>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="anomalousStatus"
           label="有无异常"
@@ -97,8 +121,8 @@
           width="100px"
         >
           <template slot-scope="scope">
-            <div class="yellow" v-if="scope.row.anomalousStatus == '1'"></div>
-            <div class="green" v-if="scope.row.anomalousStatus !== '1'"></div>
+            <div class="yellow" v-if="scope.row.anomalousStatus === 1"></div>
+            <div class="green" v-if="scope.row.anomalousStatus !== 1"></div>
           </template>
         </el-table-column>
         <el-table-column prop="recordStatus" label="状态" align="center">
@@ -111,13 +135,13 @@
             ></div>
             <p
               v-if="scope.row.recordStatus == 1"
-              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
+
             >
               <span>已完成</span>
             </p>
             <p
               v-if="scope.row.recordStatus == 0"
-              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
+
             >
               <span>进行中</span>
             </p>
@@ -145,7 +169,7 @@
               size="mini"
               @click="handleCheck(1, scope.$index, scope.row)"
               v-if="
-                scope.row.checkPerson == '保管员每周检查粮情' &&
+                scope.row.enumId == 19 &&
                   $tools.IsPermission(134)
               "
               type="detailbtn"
@@ -158,7 +182,7 @@
               type="editbtn"
               @click="handleEdit(3, scope.$index, scope.row)"
               v-if="
-                scope.row.checkPerson == '保管员每周检查粮情' &&
+                scope.row.enumId == 19 &&
                   scope.row.recordStatus == 0 &&
                   $tools.IsPermission(135)
               "
@@ -168,13 +192,13 @@
               size="mini"
               type="dangerbtn"
               v-if="
-                (scope.row.checkPerson == '保管员每周检查粮情' &&
+                (scope.row.enumId == 19 &&
                   $tools.IsPermission(332)) ||
-                  (scope.row.checkPerson == '主管科长每2周检查粮情' &&
+                  (scope.row.enumId == 20 &&
                     $tools.IsPermission(333)) ||
-                  (scope.row.checkPerson == '分管副总每月检查粮情' &&
+                  (scope.row.enumId == 21 &&
                     $tools.IsPermission(334)) ||
-                  (scope.row.checkPerson == '总经理每季检查粮情' &&
+                  (scope.row.enumId == 22 &&
                     $tools.IsPermission(335))
               "
               @click="handleDelete(scope.$index, scope.row)"
@@ -207,7 +231,8 @@ import {
   checkGrainInfo,
   deleteGrainInfo,
   editGrainInfo,
-  getDateTimeNow
+  getDateTimeNow,
+  getGrainItems
 } from "@/api/grainCheck/index"
 export default {
   // components: { Pagination },
@@ -219,6 +244,8 @@ export default {
       data2: [],
       depotId: this.$store.state.depotId,
       houseId: this.$store.state.houseId,
+      grainKind: [], //粮情检查类别
+
       // select 选项数据
       options: [
         {
@@ -238,7 +265,7 @@ export default {
           label: "总经理每季检查粮情"
         }
       ],
-      check_person: "",
+      kind:'',
       value2: "",
       type: "", //判断是否从更多纪录跳转过来
       // 分页
@@ -255,15 +282,17 @@ export default {
   mounted() {
     this.activeName = this.$route.name
     let routeParams = this.$route.query
-    // console.log(routeParams,'routerouteParams')
-    console.log(routeParams.type, "type")
-    console.log(this.data2, "this.data2")
+    console.log(routeParams,'routerouteParams')
+    // console.log(routeParams.type, "type")
+    // console.log(this.data2, "this.data2")
     this.type = routeParams.type
+    this.getGrainList() //进入页面先拿到粮情类型字典表
     if (this.type == "" || this.type == null || this.type == undefined) {
       this.getList()
     } else if (this.type == 5) {
-      console.log(routeParams.data.checkPerson, "routeParams.data.checkPerson")
-      this.check_person = routeParams.data.checkPerson
+      // console.log(routeParams.data.enumId,'enumId')
+      this.kind = routeParams.data.enumId
+
       this.handleQuery()
     }
   },
@@ -280,6 +309,18 @@ export default {
     }
   },
   methods: {
+    // 获取粮情字典项
+    getGrainList() {
+      const parentId = 18 //粮情检查类型parentId
+      getGrainItems(parentId)
+        .then(res => {
+          console.log(res, "res字典粮情检查类型")
+          this.grainKind = res.data
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
     // 获取数据
     getList() {
       let condition = {
@@ -287,13 +328,13 @@ export default {
         depotId: this.depotId
       }
       let data = {
-        condition: JSON.stringify(condition),
+        Condition: JSON.stringify(condition),
         pageIndex: this.listQuery.page,
         pageSize: this.listQuery.limit
       }
       getAllPages(data)
         .then(res => {
-          console.log(res)
+          console.log(res,'全部粮情信息')
           if (res.code == 200) {
             console.log(res, "res.data.records")
             this.data2 = res.data.records
@@ -301,6 +342,7 @@ export default {
             this.listQuery.limit = res.data.size
             this.total = res.data.total
             // console.log(this.listQuery, "分页信息")
+            console.log(this.data2,'this.data2.....')
           }
         })
         .catch(err => {
@@ -309,7 +351,7 @@ export default {
     },
     // 查询
     handleQuery() {
-      let condition = {
+      /* let condition = {
         check_person: this.check_person,
         // check_person: "科长每两周检查粮情",
         check_start_time: this.value2[0],
@@ -324,9 +366,22 @@ export default {
         pageSize: this.listQuery.limit,
 
         condition: JSON.stringify(condition)
+      } */
+      let condition = {
+        houseId: this.houseId,
+        depotId: this.depotId,
+        startTime: this.value2[0],
+        endTime: this.value2[1],
+        enumId: this.kind
+      }
+      let data8 = {
+        pageIndex: this.listQuery.page,
+        pageSize: this.listQuery.limit,
+        condition: JSON.stringify(condition)
       }
-      console.log(data3,'data3')
-      queryGrainInfo(data3)
+
+      console.log(data8,'data----')
+      queryGrainInfo(data8)
         .then(res => {
           this.data2 = res.data.records
           this.total = res.data.total
@@ -354,8 +409,8 @@ export default {
     },
     // 删除
     handleDelete(a, b) {
-      console.log(b.id)
-      // this.allGrainData.splice(a, 1)
+/*       console.log(a,'a')
+      // console.log(b.id,'b') */
 
       this.$confirm("确定删除该项记录?", "提示", {
         confirmButtonClass: "el-button--success is-plain",
@@ -366,22 +421,25 @@ export default {
         let id = b.id
         deleteGrainInfo(id)
           .then(res => {
-            console.log(res)
+            if(res.code == 200){
+              console.log(res,'res')
             this.$message({
               message: "恭喜你，删除成功了！",
               type: "success"
             })
             this.getList()
+            }
+
           })
           .catch(err => {
-            console.log(err)
+            console.log(err,'err信息')
           })
       })
     },
     // 修改
     handleEdit(type, index, row) {
       // console.log(row, "row")
-      row.checkTime = getDateTimeNow
+      row.checkTime = getDateTimeNow()
       // console.log(row.checkTime,'row.checktime')
       this.$router.push({
         path: "/grainCheck/addNewGrain",
@@ -398,7 +456,7 @@ export default {
     //清空
     clear() {
       this.value2 = ""
-      this.check_person = ""
+      this.kind = ""
       this.handleQuery() // 清空选项同时查询数据回显
     },
     handleClick(tab, event) {

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/addNewGrain.vue

@@ -5,8 +5,8 @@
         <span>粮情检测类型:</span>
         <span>{{ checkPerson }}</span>
       </div>
-
-      <div class="table">
+      <!-- 2新增3修改 -->
+      <div class="table" v-show="type == 2 || type == 3">
         <el-table
           border
           :header-cell-style="{ background: '#f8f8f8' }"
@@ -23,53 +23,110 @@
             label="序号"
             width="50px"
           />
+          <el-table-column prop="createDate" label="检查时间" align="center">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.createDate == null
+                  ? scope.row.createDate
+                  : scope.row.createDate.slice(0, 16)
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
-            prop="createTime"
-            label="检查时间"
+            prop="fieldValue"
+            label="检查项对应名称"
             align="center"
-          /><el-table-column
+            v-if="false"
+          />
+          <el-table-column prop="enumName" label="检查项" align="center" />
+          <el-table-column prop="enumOrder" label="选项" align="center">
+            <template slot-scope="scope">
+              <el-radio-group
+                v-model="scope.row.enumOrder"
+                @change.native="showClick(scope.$index, scope.row)"
+                :disabled="isDetail"
+              >
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+                <el-link
+                  :underline="false"
+                  class="spike"
+                  id="spike"
+                  v-if="
+                    scope.row.enumOrder == 1 &&
+                      scope.row.enumName.indexOf('异常') != -1
+                  "
+                  @click="showHandler(scope.row)"
+                >
+                  {{ scope.row.enumName + "  >>" }}
+                </el-link>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 1查看 -->
+      <div class="table" v-show="type == 1">
+        <el-table
+          border
+          :header-cell-style="{ background: '#f8f8f8' }"
+          ref="orderTable"
+          highlight-current-row
+          :data="tbdata"
+          height="631"
+          row-key="index"
+          @current-change="handleCurrentChange"
+        >
+          <el-table-column
+            type="index"
+            align="center"
+            label="序号"
+            width="50px"
+          />
+          <el-table-column prop="createDate" label="检查时间" align="center">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.createDate == null
+                  ? scope.row.createDate
+                  : scope.row.createDate.slice(0, 16)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="fieldValue"
             label="检查项对应名称"
             align="center"
             v-if="false"
           />
-          <el-table-column prop="fieldDetail" label="检查项" align="center" />
-          <el-table-column prop="whether" label="选项" align="center">
+          <el-table-column prop="enumName" label="检查项" align="center" />
+          <el-table-column prop="enumOrder" label="选项" align="center">
             <template slot-scope="scope">
               <el-radio-group
-                v-model="scope.row.whether.radio"
+                v-model="scope.row.enumOrder"
                 @change.native="showClick(scope.$index, scope.row)"
                 :disabled="isDetail"
               >
-                <el-radio label="1">{{ scope.row.whether.status1 }}</el-radio>
-                <el-radio label="0">{{ scope.row.whether.status2 }}</el-radio>
-                <!--                 <div v-if="type == '2' ">
-                  <el-button>新增显示</el-button>
-                </div> -->
-                <!-- <div v-if="type == '1' || type == '3'"> -->
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
                 <el-link
                   :underline="false"
                   class="spike"
                   id="spike"
                   v-if="
-                    scope.row.whether.radio == 1 &&
-                      scope.row.fieldDetail.indexOf('异常') != -1
+                    scope.row.enumOrder == 1 &&
+                      scope.row.enumName.indexOf('异常') != -1
                   "
                   @click="showHandler(scope.row)"
                 >
-                  {{ scope.row.fieldDetail + "  >>" }}
+                  {{ scope.row.enumName + "  >>" }}
                 </el-link>
-                <!-- </div> -->
-
-                <!-- <el-button   v-if='scope.row.whether.radio ==1 && scope.row.fieldDetail.indexOf("异常") != -1'>{{scope.row.fieldDetail + '  >>'}}</el-button> -->
               </el-radio-group>
             </template>
           </el-table-column>
         </el-table>
       </div>
-
       <div class="btns">
-        <el-button type="cancel" @click="cancel()"> 返回 </el-button>
+        <el-button type="cancel" @click="back()"> 返回 </el-button>
 
         <el-button
           type="savebtn"
@@ -87,10 +144,6 @@
           @click="saveInfo"
           >保存</el-button
         >
-
-        <!--       <div v-if='type="1" || type="3"'>
-
-      </div> -->
       </div>
 
       <!-- 新增虫害异常 -->
@@ -126,7 +179,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false" type="cancel"
+          <el-button @click="cancel('abnormalPest')" type="cancel"
             >取 消</el-button
           >
           <el-button type="savebtn" @click="saveFormData()">确 定</el-button>
@@ -147,7 +200,7 @@
           ></el-input>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible1 = false" type="cancel"
+          <el-button @click="cancel('abnormalWater')" type="cancel"
             >取 消</el-button
           >
           <el-button type="savebtn" @click="dialogFormVisible1 = false"
@@ -171,7 +224,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible2 = false" type="cancel"
+          <el-button @click="cancel('abnormalGrain')" type="cancel"
             >取 消</el-button
           >
           <el-button type="savebtn" @click="saveForm">确 定</el-button>
@@ -190,7 +243,8 @@ import {
   addInfo,
   getDateTimeNow,
   haveDone, //处理待办
-  haveDone1
+  haveDone1,
+  getGrainItems
 } from "@/api/grainCheck/index"
 export default {
   name: "AddNewGrain",
@@ -217,7 +271,7 @@ export default {
         pestDensity: "", // 虫害密度
         occurArea: "", //发生面积
         occurPosition: "", // 发生部位
-        pestType: " ", // 虫害种类
+        pestType: "", // 虫害种类
         abnormalGrain: "", // 粮情异常描述
         abnormalWater: "" // 水分检测异常描述
       },
@@ -230,8 +284,9 @@ export default {
       // 每行id
       id: "",
       // 按钮类型
-      type: "",
+      type: "", // 2：新增 1：查看 3：修改
       show: "true", //查看时不显示改为false
+      isExist: false, //点击选项时判断是否存在该项数据，存在更新，不存在新增
       // 检查类型
       checkPerson: "",
       data2: {}, //待办传参过来的数据
@@ -261,27 +316,52 @@ export default {
           // pestOccurArea: "",
           pestType: ""
         }
+      },
+      // 重构后的新增数据模板
+      data5: {
+        grainConditionRecord: {
+          anomalousStatus: 0, //异常状态（0无异常，1有异常）
+          checkPerson: 0, //检查人
+          checkYear: 0, //检查年份（用于粮情异常等，做年统计）
+          checkYearWeek: 0, //检查所在年第几周
+          depotId: 0, //库id
+          enumId: 0, //检查类型
+          enumOrder: 0, //用于同公共枚举同步顺序
+          houseId: 0, //仓房id
+          id: 0, //粮情检测记录id
+          operationTime: "", //检查（操作）时间
+          recordStatus: 0, //记录状态（0进行中，1完成）
+          grainError: null, //粮情异常，值为对应的enumId
+          insectPestError: null, //虫害异常 值为对应的enumId
+          wetCheckError: null //水分检测异常 值为对应的enumId
+        },
+        grainConditionRecordChildren: [
+          /* {
+            anomalousStatus: 0, //是否异常_选项(0:否，1：是)
+            enumId: 0, //检查类型
+            id: 0, //粮情检查新增检查项
+            operationTime: "string", //操作时间
+            parentId: 0 //关联主表id（检查人id-保管员或总经理等）
+          } */
+        ]
       }
     }
   },
-  /*   created(){
-     this.$nextTick(() => {
-
-    if (this.$route.query.type == '1') {
-      this.reast()
-      this.pageTitle = '查看'
-      this.isDetail = true
-      this.detailInfo()
-    }
-  }, */
 
   mounted() {
     // 初始化的时候把参数拼接到要传输的数据里
     let routeParams = this.$route.query
-    /*     console.log(routeParams,'routeParams')
-    console.log(this.$store.state.depotId,'this.$store.state.depotId') */
+    // console.log(routeParams, "routeParams")
+    // console.log(this.$store.state.depotId, "this.$store.state.depotId")
     this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
     this.uid = this.userInfo.uid
+
+    if (routeParams.type == 3) {
+      this.data5.grainConditionRecord = routeParams.data
+    }
+
+    this.data5.grainConditionRecord.checkPerson = this.userInfo.uid
+    this.data5.grainConditionRecord.enumId = routeParams.data.enumId
     // console.log(this.$route.query.daibanObj,'this.$route.query.daibanObj')
     //待办数据
     this.data2 = this.$route.query.daibanObj
@@ -291,17 +371,14 @@ export default {
     this.id = routeParams.data.id
     // console.log(this.id,'this.id')
     this.type = routeParams.type
-    this.checkPerson = routeParams.data.checkPerson
-    this.data = routeParams
-    this.describe = JSON.parse(routeParams.data.checkDescribe)
-    this.data3.checkTime = routeParams.data.checkTime
-    this.data3.checkPerson = routeParams.data.checkPerson
-    this.data3.recordStatus = routeParams.data.recordStatus
-    this.data3.anomalousStatus = routeParams.data.anomalousStatus
+    // console.log(this.type, "this.type....")
+    // this.checkPerson = routeParams.data.checkPerson
+    // this.data = routeParams
+    // this.describe = JSON.parse(routeParams.data.checkDescribe)
 
     // 获取用户的库id和仓房id
     let userinfo = JSON.parse(localStorage.getItem("userInfo"))
-    console.log(userinfo, "userinfo............")
+    // console.log(userinfo, "userinfo............")
     // this.depot_id = this.$store.state.depotId
     // this.house_id = userinfo.houseId
     // console.log(routeParams.data,'routeParams.data')
@@ -309,144 +386,196 @@ export default {
       this.show = false
     } else if (this.type == 3) {
       if (Object.getOwnPropertyNames(this.describe).length - 1 == 14) {
-        console.log(Object.getOwnPropertyNames(this.describe).length, "0.0.0.")
+        // console.log(Object.getOwnPropertyNames(this.describe).length, "0.0.0.")
         this.flag = true
       }
     }
-    /* if(this.type !==2 && Object.getOwnPropertyNames(this.describe).length-1 ==14){
-      // console.log('this.flag')
-      this.flag = true
-    } */
+
     // 新增初始化数据
     this.getinfo()
   },
 
   methods: {
     showHandler(val) {
-      // console.log(val,'val...')
-      if (val.fieldValue == "pest_abnormal") {
+      // console.log(val, "val...")
+      if (val.enumId == 189) {
         this.dialogFormVisible = true
-      } else if (val.fieldValue == "water_abnormal") {
+      } else if (val.enumId == 190) {
         this.dialogFormVisible1 = true
-      } else if (val.fieldValue == "grain_abnormal") {
+      } else if (val.enumId == 191) {
         this.dialogFormVisible2 = true
       }
     },
     getinfo() {
       // 目前只有一页，在前端写死了请求参数
       // 在内部判断是新增修改还是查看
-      let condition = {
-        table_name: "grain_condition_record",
-        field_name: "check_list"
-      }
-      let data1 = {
-        pageIndex: 1,
-        pageSize: 30,
-        condition: JSON.stringify(condition)
-      }
-      // console.log(this.type,'type...')
-      if (this.type == "2") {
-        getAddInfo(data1)
+
+      // console.log(this.type, "type...")
+      if (this.type == 2) {
+        // console.log("新增页面初始化")
+        getGrainItems(19)
           .then(res => {
-            //新增初始化
-            this.tbdata = res.data.records
-            this.depot_id = this.$store.state.depotId
-            /*           console.log(this.$store.state.houseId,'this.$store.state.houseId')
-          console.log(this.$store.state.depotId,'this.$store.state.depotId')
-          console.log(this.data2,'this.data2')
-          console.log(this.userInfo.depotId,'this.userInfo.depotId') */
+            if (res.code == 200) {
+              // console.log(res, "res字典19")
+              this.tbdata = res.data
+              // 新增时把检查项数据给保存下来
+              this.data5.grainConditionRecordChildren = JSON.parse(
+                JSON.stringify(res.data)
+              )
+              this.data5.grainConditionRecordChildren.map(item => {
+                item.id = null
+                delete item.delFlag
+                delete item.parentId
+                delete item.remark
+                delete item.enumName
+                delete item.enumOrder
+                delete item.createDate
+              })
+              // console.log(this.tbdata, "tbdata.......")
+              // console.log(
+              //   this.data5.grainConditionRecordChildren,
+              //   " this.data5.grainConditionRecordChildren......."
+              // )
+            }
           })
           .catch(err => {
             console.log(err)
           })
       } else if (this.type == "1") {
         //查看
-        this.isDetail = true
-        getAddInfo(data1)
+        // 检查项初始化
+        getGrainItems(19)
           .then(res => {
-            // console.log(res)
-            this.tbdata = res.data.records
-            // console.log("产看修改初始化")
             if (res.code == 200) {
-              // 如果成功，就再次调用查看接口
+              this.tbdata = res.data
+              // this.data5.grainConditionRecordChildren = JSON.parse(JSON.stringify(res.data))
+              // console.log(this.tbdata, "tbdata.......")
+              //获取查看数据
               checkGrainInfo(this.id)
                 .then(res => {
-                  this.describe = JSON.parse(res.data.checkDescribe)
-                  //如果有异常项，就把异常项的值赋值给form数据源
-                  this.form.pestDensity = this.data.data.grainAbnormalDescribe.pestDensity
-                  this.form.occurArea = this.data.data.grainAbnormalDescribe.occurArea
-                  this.form.occurPosition = this.data.data.grainAbnormalDescribe.occurPosition
-                  this.form.pestType = this.data.data.grainAbnormalDescribe.pestType
-                  this.form.abnormalGrain = this.data.data.grainAbnormalDescribe.abnormalGrain
-                  this.form.abnormalWater = this.data.data.grainAbnormalDescribe.abnormalWater
-
-                  /* 遍历this.describe的key跟初始化时的每一项的fieldValue匹配，
-            匹配成功则把时间跟choose赋值给数据源tbdata */
+                  if (res.code == 200) {
+                    // console.log(res, "获取查看数据")
 
-                  for (const key in this.describe) {
                     for (let i = 0; i < this.tbdata.length; i++) {
-                      if (key == this.tbdata[i].fieldValue) {
-                        this.tbdata[i].createTime = this.describe[key].time
-                        this.tbdata[i].whether.radio = this.describe[key].choose
+                      for (let j = 0; j < res.data.length; j++) {
+                        if (this.tbdata[i].enumId == res.data[j].enumId) {
+                          // console.log(this.tbdata.indexOf(this.tbdata[i]),"this.tbdata[i]的index" )
+                          // console.log( res.data.indexOf(res.data[j]),"res.data.indexOf(res.data[j])")
+                          // var itemIndex = this.tbdata.indexOf(this.tbdata[i])
+                          if (
+                            this.tbdata[i].enumId == 189 ||
+                            this.tbdata[i].enumId == 190 ||
+                            this.tbdata[i].enumId == 191
+                          ) {
+                            // console.log(this.tbdata[i].enumName)
+                            this.tbdata[i].createDate =
+                              res.data[j].operationTime
+                            this.tbdata[i].enumOrder = String(
+                              res.data[j].anomalousStatus
+                            )
+                            //如果有异常项，就把异常项的值赋值给form数据源
+
+                            if (res.data[j].anomalousStatus == 1) {
+                              this.form = JSON.parse(res.data[j].errorDescribed)
+                              // console.log(this.form, "this.form")
+                              // console.log(
+                              //   res.data[j].errorDescribed,
+                              //   "res.data[j].errorDescribed"
+                              // )
+                            }
+                          } else {
+                            this.tbdata[i].createDate =
+                              res.data[j].operationTime
+                            this.tbdata[i].enumOrder = String(
+                              res.data[j].anomalousStatus
+                            )
+                          }
+                        }
                       }
                     }
-                    // if(key ==this.)
                   }
                 })
                 .catch(err => {
-                  console.log(err)
+                  console.log(err, "获取查看数据失败信息")
                 })
             }
           })
           .catch(err => {
             console.log(err)
           })
+        this.isDetail = true
       } else if (this.type == "3") {
         //修改
-        getAddInfo(data1)
+        // 检查项初始化
+        getGrainItems(19)
           .then(res => {
-            // console.log(res,'修改接口获取到的数据')
-            this.tbdata = res.data.records
-            // console.log("产看修改初始化")
             if (res.code == 200) {
-              // 如果成功，就再次调用查看接口
+              // console.log(res, "res修改数据")
+              this.tbdata = res.data
+              // console.log(this.tbdata, "tbdata.......")
+              //获取数据
               checkGrainInfo(this.id)
                 .then(res => {
-                  console.log(res.data, "修改查看res")
-                  this.data3 = res.data
-                  // this.data3.checkDescribe = JSON.parse(res.data.checkDescribe)
-                  this.describe = JSON.parse(res.data.checkDescribe)
-                  this.data3.checkDescribe = this.describe
-
-                  //如果有异常项，就把异常项的值赋值给form数据源
-                  this.form.pestDensity = this.data.data.grainAbnormalDescribe.pestDensity
-                  this.form.occurArea = this.data.data.grainAbnormalDescribe.occurArea
-                  this.form.occurPosition = this.data.data.grainAbnormalDescribe.occurPosition
-                  this.form.pestType = this.data.data.grainAbnormalDescribe.pestType
-                  this.form.abnormalGrain = this.data.data.grainAbnormalDescribe.abnormalGrain
-                  this.form.abnormalWater = this.data.data.grainAbnormalDescribe.abnormalWater
-                  // console.log(this.form,'this.form............')
-                  /* 遍历this.describe的key跟初始化时的每一项的fieldValue匹配，
-            匹配成功则把时间跟choose赋值给数据源tbdata */
+                  if (res.code == 200) {
+                    // console.log(res, "获取修改数据")
+                    /*  res.data.forEach(item =>{
+                delete item.parentId
+              }) */
+                    // this.data5.grainConditionRecordChildren = JSON.parse(JSON.stringify(res.data))
 
-                  for (const key in this.describe) {
+                    this.data5.grainConditionRecordChildren = res.data
                     for (let i = 0; i < this.tbdata.length; i++) {
-                      if (key == this.tbdata[i].fieldValue) {
-                        this.tbdata[i].createTime = this.describe[key].time
-                        this.tbdata[i].whether.radio = this.describe[key].choose
+                      for (let j = 0; j < res.data.length; j++) {
+                        if (this.tbdata[i].enumId == res.data[j].enumId) {
+                          if (
+                            this.tbdata[i].enumId == 189 ||
+                            this.tbdata[i].enumId == 190 ||
+                            this.tbdata[i].enumId == 191
+                          ) {
+                            // console.log(this.tbdata[i].enumName)
+                            this.tbdata[i].createDate =
+                              res.data[j].operationTime
+                            this.tbdata[i].enumOrder = String(
+                              res.data[j].anomalousStatus
+                            )
+                            //如果有异常项，就把异常项的值赋值给form数据源
+                            if (res.data[j].anomalousStatus == 1) {
+                              this.form = JSON.parse(res.data[j].errorDescribed)
+                              // console.log(this.form, "this.form")
+                              // console.log(
+                              //   res.data[j].errorDescribed,
+                              //   "res.data[j].errorDescribed"
+                              // )
+                            }
+
+                            //  this.data5.grainConditionRecordChildren.push(res.data[i])
+                          } else {
+                            this.tbdata[i].createDate =
+                              res.data[j].operationTime
+                            // this.tbdata[i].enumOrder = res.data[j].anomalousStatus
+                            this.tbdata[i].enumOrder = String(
+                              res.data[j].anomalousStatus
+                            )
+                            // this.data5.grainConditionRecordChildren.push(res.data[i])
+                          }
+                        }
                       }
                     }
-                    // if(key ==this.)
+                    // console.log(
+                    //   this.data5.grainConditionRecordChildren,
+                    //   "this.data5.grainConditionRecordChildren"
+                    // )
                   }
                 })
                 .catch(err => {
-                  console.log(err)
+                  console.log(err, "获取查看数据失败信息")
                 })
             }
           })
           .catch(err => {
             console.log(err)
           })
+        // this.isDetail = true
       }
     },
 
@@ -466,87 +595,167 @@ export default {
     handleCurrentChange() {},
     // 通过判断单选按钮的选择，弹出异常表单
     showClick(index, val) {
-      console.log(this.tbdata,'this.tbdata')
-      console.log(index,'-index',val,'--val....')
+      this.isExist = false
+      // console.log(this.tbdata, "this.tbdata000...")
+      // var arr = this.tbdata
+      // console.log(index, "-index", val, "--val....")
+      // console.log(
+      //   this.data5.grainConditionRecordChildren,
+      //   "this.data5.grainConditionRecordChildren"
+      // )
       let time = getDateTimeNow()
-      this.tbdata[index].createTime = time
-      // 动态的把当前检查项作为对象名称保存到checkDescribe
-      this.data3.checkDescribe[this.tbdata[index].fieldValue] = {
-        choose: this.tbdata[index].whether.radio,
-        time: this.tbdata[index].createTime
-      }
-     if (
-          this.tbdata[6].fieldValue == "pest_abnormal"  && this.tbdata[6].whether.radio == 1 ||
-          this.tbdata[7].fieldValue == "water_abnormal" && this.tbdata[7].whether.radio == 1 ||
-          this.tbdata[8].fieldValue == "grain_abnormal" && this.tbdata[8].whether.radio == 1
-        ) {
-          this.data3.anomalousStatus = 1
-          console.log(this.data3.anomalousStatus,'异常触发')
-        }else if(
-          (this.tbdata[6].fieldValue == "pest_abnormal"  && this.tbdata[6].whether.radio == 0) &&
-          (this.tbdata[7].fieldValue == "water_abnormal" && this.tbdata[7].whether.radio == 0) &&
-          (this.tbdata[8].fieldValue == "grain_abnormal" && this.tbdata[8].whether.radio == 0)
-        ){
-          this.data3.anomalousStatus = 0
-          console.log(this.data3.anomalousStatus,'this.data3.anomalousStatus')
+      // 重构--时间字段名称改变
+      this.tbdata[index].createDate = time
+      // 动态的把当前检查项作为对象名称保存到grainConditionRecordChildren
+      // this.data5.grainConditionRecordChildren
 
+      // 判断当前数组长度是否为0，若为0 则直接新增数据，否则进行遍历看当前是否存在
+      // console.log(this.data5.grainConditionRecordChildren.length, "length...")
+      if (this.data5.grainConditionRecordChildren.length == 0) {
+        // console.log("此时数组为空，可以直接新增")
+        this.data5.grainConditionRecordChildren.push({
+          anomalousStatus: Number(val.enumOrder), //是否异常_选项(0:否，1：是)
+          enumId: val.enumId,
+          id: val.id,
+          operationTime: val.createDate
+        })
+      } else {
+        // 数组不为空时遍历数组,判断数组中是否已存在该项数据
+        // console.log("判断数据是否已存在")
+        for (const i in this.data5.grainConditionRecordChildren) {
+          // console.log(i, "i")
+          if (this.data5.grainConditionRecordChildren[i].enumId == val.enumId) {
+            // 数组中存在该项数据，则更新该数据
+            this.data5.grainConditionRecordChildren[i].anomalousStatus = Number(
+              val.enumOrder
+            )
+            this.data5.grainConditionRecordChildren[i].operationTime =
+              val.createDate
+            // this.data5.grainConditionRecordChildren[i].anomalousStatus = Number(val.enumOrder)
+            this.isExist = true
+            // console.log(this.isExist, "this.isExist")
+            break
+          }
         }
+        /* console.log(this.isExist, "isexist")
+        if (!this.isExist) {
+          console.log("数组中无此元素，可以新增")
+          this.data5.grainConditionRecordChildren.push({
+            anomalousStatus: Number(val.enumOrder), //是否异常_选项(0:否，1：是)
+            enumId: val.enumId,
+            id: val.id,
+            operationTime: val.createDate
+          })
+        } */
+      }
 
-      // console.log(this.data3.checkDescribe,'this.data3.checkDescribe....')
-      let len = Object.getOwnPropertyNames(this.data3.checkDescribe).length - 1
+      // console.log(
+      //   this.data5.grainConditionRecordChildren,
+      //   "this.data5.grainConditionRecordChildren....."
+      // )
+      // console.log(this.data5,'this.data5------')
+      // enumId: 189(虫害异常)、190(水分检测异常)、191(异常粮情)
+      var count = 0
+      this.data5.grainConditionRecordChildren.forEach(item => {
+        if (item.anomalousStatus != undefined) {
+          count += 1
+          // console.log(count,'count')
+        }
+      })
+      // let len = this.data5.grainConditionRecordChildren.length
       // console.log(len,'len............')
-      //判断map对象的长度，改变暂存按钮的状态
-      if (len < 14) {
+      //判断数组的长度，改变暂存按钮的状态
+      if (count < 14) {
         this.flag = false
-        this.data3.recordStatus = 0
+        this.data5.grainConditionRecord.recordStatus = 0
+        // this.data3.recordStatus = 0
       } else {
         this.flag = true
-        this.data3.recordStatus = 1
+        this.data5.grainConditionRecord.recordStatus = 1
+        // this.data3.recordStatus = 1
       }
       // console.log(val.whether.radio)
       // 通过判断radio值是否为1，控制异常项弹出框 (单选框1：是 0：否)
-      if (val.whether.radio == 1) {
-        if (val.fieldValue == "pest_abnormal") {
-          this.dialogFormVisible = true
-        }
-        if (val.fieldValue == "water_abnormal") {
-          this.dialogFormVisible1 = true
-        }
-        if (val.fieldValue == "grain_abnormal") {
-          // console.log("进了粮情异常表单")
-          this.dialogFormVisible2 = true
-        }
-
+      if (val.enumId == 189 && val.enumOrder == 1) {
+        // console.log('触发虫害异常')
+        this.dialogFormVisible = true
+      }
+      if (val.enumId == 190 && val.enumOrder == 1) {
+        // console.log('触发水分异常')
+        this.dialogFormVisible1 = true
+      }
+      if (val.enumId == 191 && val.enumOrder == 1) {
+        // console.log('触发粮情异常')
+        this.dialogFormVisible2 = true
       }
+
       //判断异常项是否被选中是，选中则改变异常状态
     },
     // 暂存或者保存
     saveInfo() {
-      this.data3.grainAbnormalDescribe = this.form
-      this.data3.checkTime = getDateTimeNow()
+      // this.data3.grainAbnormalDescribe = this.form
+      // this.data3.checkTime = getDateTimeNow()
+      this.data5.grainConditionRecord.operationTime = getDateTimeNow()
+      /* this.data5.grainConditionRecord.depotId = this.depot_id
+       this.data5.grainConditionRecord.houseId = this.house_id */
       // console.log(this.data3.checkTime,'this.data3.checkTime')
       this.loading = true
       if (this.type == "2") {
-        this.data3.depotId = this.depot_id
-        this.data3.houseId = this.house_id
-        console.log(this.house_id, "house_id")
-        console.log(this.data3.houseId, "this.data3.houseId...")
-        this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
+        this.data5.grainConditionRecord.depotId = this.depot_id
+        this.data5.grainConditionRecord.houseId = this.house_id
+        // console.log(this.house_id, "house_id")
+        // console.log(this.data3.houseId, "this.data3.houseId...")
+        // this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
+        // 如果有异常项，则分别给异常项赋值对应的字典表id
+        this.data5.grainConditionRecordChildren.forEach(ele => {
+          if (ele.enumId == 189 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.insectPestError = ele.enumId
+          } else if (ele.enumId == 190 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.wetCheckError = ele.enumId
+          } else if (ele.enumId == 191 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.grainError = ele.enumId
+          }
+          //  判断异常项是否被选中 '是'
+          if (
+            (ele.enumId == 189 && ele.anomalousStatus == 1) ||
+            (ele.enumId == 190 && ele.anomalousStatus == 1) ||
+            (ele.enumId == 191 && ele.anomalousStatus == 1)
+          ) {
+            ele.errorDescribed = JSON.stringify(this.form)
+            // console.log(ele,'ele.............')
+            if (
+              this.data5.grainConditionRecord.anomalousStatus == 0 ||
+              this.data5.grainConditionRecord.anomalousStatus == null
+            ) {
+              this.data5.grainConditionRecord.anomalousStatus = 1
+              // console.log(
+              //   this.data5.grainConditionRecord.anomalousStatus,
+              //   "触发异常"
+              // )
+            }
+          } /* else if(this.data5.grainConditionRecord.anomalousStatus == 1){
+          this.data5.grainConditionRecord.anomalousStatus = 0
+          console.log(this.data5.grainConditionRecord.anomalousStatus,'异常解除')
+        } */
+        })
+        console.log(JSON.parse(JSON.stringify(this.data5)), "this.data5----")
 
-        addInfo(this.data3)
+        addInfo(JSON.parse(JSON.stringify(this.data5)))
           .then(res => {
-            console.log(this.data3, "this.data3")
-            console.log(res,'res222111...')
-            console.log('新增成功........')
+            // console.log(this.data3, "this.data3")
+            // console.log(res, "res222111...")
+
+            if (res.code == 200) {
+              // console.log(res,'res=200')
+              // console.log("新增成功........")
               this.loading = false
               this.$message({
-              message: "新增成功！",
-              type: "success"
-            })
-            this.$router.push({
-              path: "/reservesManagement/grainCheck/newGrain"
-            })
-            if (res.code == 200) {
+                message: "新增成功！",
+                type: "success"
+              })
+              this.$router.push({
+                path: "/reservesManagement/grainCheck/newGrain"
+              })
 
               if (!(JSON.stringify(this.data2) == {})) {
                 if (
@@ -557,14 +766,14 @@ export default {
                   //当选项全部被选中后调用接口
                   let auditState = 4 //4 是已完成
                   //判断是否切换仓房，或者仓房发生改变
-                  console.log(this.house_id,this.data2.houseId,'houseId')
+                  // console.log(this.house_id, this.data2.houseId, "houseId")
                   if (this.house_id == this.data2.houseId) {
                     haveDone(this.data2.id, auditState)
                       .then(res => {
                         console.log(res, "res.......")
                       })
                       .catch(err => {
-                        console.log(err)
+                        console.log(err, "654213")
                       })
                   } else {
                     let userId = this.uid
@@ -589,18 +798,54 @@ export default {
                   }
                 }
               }
-
             }
-
           })
           .catch(err => {
             this.loading = false
-            console.log(err, "获取不到仓房houseId")
+            console.log(err, "新增错误信息")
           })
       } else if (this.type == "1" || this.type == "3") {
-        this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
-        // console.log(this.data3,'xiugai hou 的data3')
-        editGrainInfo(this.data3)
+        // this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
+        this.data5.grainConditionRecord.depotId = this.depot_id
+        this.data5.grainConditionRecord.houseId = this.house_id
+        // console.log(this.house_id, "house_id")
+        // console.log(this.data3.houseId, "this.data3.houseId...")
+        // this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
+        // 如果有异常项，则分别给异常项赋值对应的字典表id
+        this.data5.grainConditionRecordChildren.forEach(ele => {
+          if (ele.enumId == 189 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.insectPestError = ele.enumId
+          } else if (ele.enumId == 190 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.wetCheckError = ele.enumId
+          } else if (ele.enumId == 191 && ele.anomalousStatus == 1) {
+            this.data5.grainConditionRecord.grainError = ele.enumId
+          }
+          //  判断异常项是否被选中 '是'
+          if (
+            (ele.enumId == 189 && ele.anomalousStatus == 1) ||
+            (ele.enumId == 190 && ele.anomalousStatus == 1) ||
+            (ele.enumId == 191 && ele.anomalousStatus == 1)
+          ) {
+            ele.errorDescribed = JSON.stringify(this.form)
+            // console.log(ele,'ele.............')
+            if (
+              this.data5.grainConditionRecord.anomalousStatus == 0 ||
+              this.data5.grainConditionRecord.anomalousStatus == null
+            ) {
+              this.data5.grainConditionRecord.anomalousStatus = 1
+              // console.log(
+              //   this.data5.grainConditionRecord.anomalousStatus,
+              //   "触发异常"
+              // )
+            }
+          } /* else if(this.data5.grainConditionRecord.anomalousStatus == 1){
+          this.data5.grainConditionRecord.anomalousStatus = 0
+          console.log(this.data5.grainConditionRecord.anomalousStatus,'异常解除')
+        } */
+        })
+        console.log(JSON.parse(JSON.stringify(this.data5)), "this.data5----")
+        console.log(this.data5, "xiugai hou 的data5")
+        editGrainInfo(this.data5)
           .then(res => {
             this.loading = true
             // console.log(res,'修改后的数据...')
@@ -622,7 +867,29 @@ export default {
       }
     },
     // 取消按钮
-    cancel() {
+    cancel(a) {
+      if (a == "abnormalPest") {
+        // 虫害异常
+        /*  console.log(this.form.pestDensity,'pestDensity')
+        console.log(this.form.occurPosition,'occurPosition')
+        console.log(this.form.occurArea,'occurArea')
+        console.log(this.form.pestType,'pestType') */
+
+        this.dialogFormVisible = false
+      } else if (a == "abnormalWater") {
+        // 水分检测异常
+        // console.log(this.form.abnormalWater,'abnormalWater')
+
+        this.dialogFormVisible1 = false
+      } else if (a == "abnormalGrain") {
+        // 粮情异常
+        // console.log(this.form.abnormalGrain,'abnormalGrain')
+
+        this.dialogFormVisible2 = false
+      }
+    },
+    // 返回按钮
+    back() {
       // 判断一下是从最新粮情进的新增还是从全部粮情的查看修改进来的
       if (this.type == "2") {
         this.$router.push({

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -15,9 +15,31 @@
           width="50px"
           sortable
         />
-        <el-table-column prop="checkPerson" label="检查类型" align="center" />
-        <el-table-column prop="checkTime" label="最后记录时间" align="center" />
-        <el-table-column prop="recordStatus" label="状态" align="center">
+        <el-table-column prop="enumId" label="检查类型" align="center">
+          <template slot-scope="scope">
+            <p v-for="item in grainKind" :key="item.enumId">
+              <span v-if="scope.row.enumId == item.enumId">{{
+                item.enumName
+              }}
+              </span>
+            </p>
+          </template>
+        </el-table-column>
+        <!-- operationTime -->
+        <el-table-column
+          prop="operationTime"
+          label="最后记录时间"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.operationTime == null
+                ? scope.row.operationTime
+                : scope.row.operationTime.slice(0, 16)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="recordStatus" label="状态" align="center"  width="100">
           <template slot-scope="scope">
             <!-- <div disable-transitions>
               {{
@@ -28,9 +50,7 @@
             </div> -->
             <div
               disable-transitions
-              v-if="
-                scope.row.recordStatus == '' || scope.row.recordStatus == null
-              "
+              v-if="scope.row.recordStatus == null"
             ></div>
             <!--  <div
               class="yellow"
@@ -42,22 +62,16 @@
             <!-- <div class="green" disable-transitions v-if="scope.row.recordStatus == '1'">
               已完成
             </div> -->
-            <p
-              v-if="scope.row.recordStatus == '1'"
-              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
-            >
+            <p v-if="scope.row.recordStatus == '1'">
               <span>已完成</span>
             </p>
-            <p
-              v-if="scope.row.recordStatus == '0'"
-              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
-            >
+            <p v-if="scope.row.recordStatus == '0'">
               <span>进行中</span>
             </p>
           </template>
         </el-table-column>
         <!-- :formatter="formatterColumn" -->
-        <!-- <el-table-column prop="anomalousStatus" label="有无异常" align="center">
+        <el-table-column prop="anomalousStatus" label="有无异常" align="center" width="120">
           <template slot-scope="scope">
             <div
               disable-transitions
@@ -67,22 +81,32 @@
               "
             ></div>
             <div disable-transitions v-if="scope.row.anomalousStatus == '0'">
-              无
+              <!-- 无 -->
+              <span class="colorspano"></span>
             </div>
             <div disable-transitions v-if="scope.row.anomalousStatus == '1'">
-              有
+              <!-- 有 -->
+              <span class="colorspant"></span>
             </div>
           </template>
         </el-table-column>
-         <el-table-column prop="checkList" label="异常项" align="center" >
+        <el-table-column prop="checkList" label="异常项" align="center"  width="250">
           <template slot-scope="scope">
-            <div
-
-              disable-transitions
-              >{{ scope.row.waterAbnormal== '1'?'水分检测异常': '' }} {{ scope.row.grainAbnormal== '1'?'粮情异常': ''}} {{scope.row.pestAbnormal == '1'?'虫害异常': ''}} </div
-            >
+            <div disable-transitions>
+              <p class="anomalousItem" v-for="item in checkItems" :key="item.enumId">
+              <span v-show="scope.row.insectPestError == item.enumId">
+                {{item.enumName}}
+              </span>
+              <span v-show="scope.row.grainError == item.enumId">
+                {{item.enumName}}
+              </span>
+              <span v-show="scope.row.wetCheckError == item.enumId">
+                 {{item.enumName}}
+              </span>
+            </p>
+            </div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column
           prop="operation"
           label="操作"
@@ -96,10 +120,10 @@
               style="border:1px solid seagreen;color:seagreen"
               @click="add(2, scope.$index, scope.row)"
               v-if="
-                (scope.row.checkPerson == '保管员每周检查粮情' && $tools.IsPermission(131)) ||
-                (scope.row.checkPerson == '主管科长每2周检查粮情' && $tools.IsPermission(206)) ||
-                (scope.row.checkPerson == '分管副总每月检查粮情' && $tools.IsPermission(207)) ||
-                (scope.row.checkPerson == '总经理每季检查粮情' && $tools.IsPermission(208))
+                (scope.row.enumId == 19 && $tools.IsPermission(131)) ||
+                  (scope.row.enumId == 20 && $tools.IsPermission(206)) ||
+                  (scope.row.enumId == 21 && $tools.IsPermission(207)) ||
+                  (scope.row.enumId == 22 && $tools.IsPermission(208))
               "
               :disabled="flag"
               >新增</el-button
@@ -126,7 +150,9 @@ import {
   addInfo,
   getDateTimeNow,
   haveDone,
-  haveDone1
+  haveDone1,
+  getGrainItems,
+  getGrainAll
 } from "@/api/grainCheck/index"
 export default {
   name: "NewGrain",
@@ -136,6 +162,7 @@ export default {
       userInfo: "",
       role: "", //用户角色
       uid: "",
+      depotDic:'',
       //库id
       depotId: "",
       // 仓房id
@@ -143,45 +170,66 @@ export default {
       // 最新粮情数据
       abnormalItems: [],
       data: [],
-      sortData: [],
-      data2: {},
-      // back:'',
-      //待办跳转过来改变其他的选项的新增按钮不能点击
-      flag: false,
-      /*   newGrainData: [
+      sortData: [
         {
-          checkPerson: "保管员每周检查粮情",
-          checkTime: "",
-          recordStatus: "",
-          anomalousStatus: "",
-          checkList: "",
-          id: 1
+          id: null,
+          enumId: 22,
+          operationTime: null,
+          recordStatus: null,
+          anomalousStatus: null,
+          checkPerson: null,
+          houseId: null,
+          depotId: null,
+          checkYear: null,
+          checkYearWeek: null,
+          enumOrder: null
         },
         {
-          checkPerson: "主管科长每两周检查粮情",
-          checkTime: "",
-          recordStatus: "",
-          anomalousStatus: "",
-          checkList: "",
-          id: 2
+          id: null,
+          enumId: 21,
+          operationTime: null,
+          recordStatus: null,
+          anomalousStatus: null,
+          checkPerson: null,
+          houseId: null,
+          depotId: null,
+          checkYear: null,
+          checkYearWeek: null,
+          enumOrder: null
         },
         {
-          checkPerson: "分管副总每月检查粮情",
-          checkTime: "",
-          recordStatus: "",
-          anomalousStatus: "",
-          checkList: "",
-          id: 3
+          id: null,
+          enumId: 19,
+          operationTime: null,
+          recordStatus: null,
+          anomalousStatus: null,
+          checkPerson: null,
+          houseId: null,
+          depotId: null,
+          checkYear: null,
+          checkYearWeek: null,
+          enumOrder: null
         },
         {
-          checkPerson: "总经理每季检查粮情",
-          checkTime: "",
-          recordStatus: "",
-          anomalousStatus: "",
-          checkList: "",
-          id: 4
+          id: 11,
+          enumId: 20,
+          operationTime: "2021-03-01 13:55:01",
+          recordStatus: 1,
+          anomalousStatus: 0,
+          checkPerson: 1,
+          houseId: 94,
+          depotId: 2,
+          checkYear: 2021,
+          checkYearWeek: 10,
+          enumOrder: 0
         }
-      ], */
+      ],
+      data2: {},
+      grainKind: [], //粮情检查类别
+      checkItems:[],// 保管员检查项
+      // back:'',
+      //待办跳转过来改变其他的选项的新增按钮不能点击
+      flag: false,
       tindex: "",
       // 先自定义后台接收数据的模板然后拼接
       data3: {
@@ -194,6 +242,7 @@ export default {
         recordStatus: "",
         anomalousStatus: "",
         ready: "",
+
         grainAbnormalDescribe: {
           abnormalGrain: "",
           abnormalWater: "",
@@ -203,6 +252,36 @@ export default {
           pestType: ""
         }
       },
+
+      // 重构后的新增数据模板
+      data5: {
+        grainConditionRecord: {
+          anomalousStatus: 0, //异常状态（0无异常，1有异常）
+          checkPerson: null, //检查人
+          // checkYear: 0,//检查年份（用于粮情异常等，做年统计）
+          // checkYearWeek: 0,//检查所在年第几周
+          depotId: null, //库id
+          enumId: null, //检查类型
+          enumOrder: 0, //用于同公共枚举同步顺序
+          houseId: null, //仓房id
+          id: null, //粮情检测记录id
+          operationTime: "string", //检查（操作）时间
+          recordStatus: 0, //记录状态（0进行中，1完成）
+          grainError:null, //粮情异常，值为对应的enumId
+          insectPestError:null, //虫害异常 值为对应的enumId
+          wetCheckError:null, //水分检测异常 值为对应的enumId
+
+        },
+        grainConditionRecordChildren: [
+          // {
+          //   anomalousStatus: 0, //是否异常_选项(0:否，1：是)
+          //   enumId: null, //检查类型
+          //   id: null, //粮情检查新增检查项
+          //   operationTime: "string", //操作时间
+          //   parentId: null //关联主表id（检查人id-保管员或总经理等）
+          // }
+        ]
+      },
       //如果是从待办进入的粮情，则把路由带的参数赋值给data4
       data4: {}
     }
@@ -211,12 +290,11 @@ export default {
     // console.log(decodeURIComponent(JSON.parse(this.$route.query)))
     // console.log(this.$route.query,'this.$route.query........')
     this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
+
     console.log(this.userInfo.roleName, "this.userInfo.roleName00000000")
-    /* switch(this.userInfo.roleName){
-      case 0:
-        role = ''
-    } */
+    this.data5.grainConditionRecord.checkPerson = this.userInfo.uid
     this.uid = this.userInfo.uid
+    // 此处是从待办跳转到本页面时传递过来的参数，用data2收集保存
     this.data2 = this.$route.query
     // console.log(this.houseId,'本页面仓房号')
 
@@ -233,11 +311,12 @@ export default {
       } */
     }
     // this.id = this.$route.query.id
-
     this.activeName = this.$route.name
     // this.houseId = this.$store.state.houseId;
     this.depotId = this.$store.state.depotId
     // this.depotId=houseData.parentCode;
+    this.getGrainList()
+
     this.getList()
   },
   computed: {
@@ -253,22 +332,56 @@ export default {
     }
   },
   methods: {
+    // 获取粮情字典项
+    getGrainList() {
+      const parentId = 18 //粮情检查类型parentId
+      getGrainItems(parentId)
+        .then(res => {
+          console.log(res, "res字典粮情检查类型")
+          this.grainKind = res.data
+        })
+        .catch(err => {
+          console.log(err)
+        })
+      // 保管员检查类型下的检查项字典表
+       getGrainItems(19)
+          .then(res => {
+            if (res.code == 200) {
+              console.log(res, "保管员检查项字典")
+              this.checkItems = res.data
+              console.log(this.checkItems, "checkItems.......")
+            }
+          })
+          .catch(err => {
+            console.log(err)
+          })
+    },
     //获取最新粮情
     getList() {
       // let userinfo =JSON.parse(localStorage.getItem("userInfo"))
       // console.log(JSON.parse(userinfo),'userInfo')
-      // console.log(userinfo.depotId)
+      // console.log(userinfo.depotId,'userinfo.depotId')
       // console.log('121111........')
-      let condition = {
-        houseId: /* (this.houseId ==null || this.houseId ==undefined)?  */ this.houseId ,
-        depotId: this.depotId
-      }
+      // let condition = {
+      //   houseId: /* (this.houseId ==null || this.houseId ==undefined)?  */ this.houseId ,
+      //   depotId: this.depotId
+      // }
       // console.log(JSON.stringify(condition),'1111')
+      // let data = {
+
+      //   condition: JSON.stringify(condition)
+      // }
       let data = {
-        /* pageIndex: 1,
-        pageSize: 10, */
-        condition: JSON.stringify(condition)
+        depotId:
+          this.depotId !== null || this.depotId !== undefined
+            ? this.depotId
+            : this.userInfo.depotId,
+        houseId:
+          this.houseId !== null || this.houseId !== undefined
+            ? this.houseId
+            : 94
       }
+      console.log(data, "data")
       getNewGrainInfo(data)
         .then(res => {
           console.log(res.data, "res000")
@@ -283,22 +396,24 @@ export default {
     sort() {
       var sortdata = this.data
       // 如果sortData是空的，使用splice进行排序，不准确
-      this.sortData = [0, 0, 0, 0]
+      // this.sortData = [0, 0, 0, 0]
+
+      console.log(this.sortData,'sortData.......')
       if (sortdata.length !== 0) {
         for (let i = 0; i < sortdata.length; i++) {
-          if (sortdata[i].checkPerson == "总经理每季检查粮情") {
+          if (sortdata[i].enumId == 22) {
             console.log(sortdata[i], "总经理 ")
             this.sortData.splice(0, 1, sortdata[i])
           }
-          if (sortdata[i].checkPerson == "分管副总每月检查粮情") {
+          if (sortdata[i].enumId == 21) {
             console.log(this.data[i], "分管副总")
             this.sortData.splice(1, 1, sortdata[i])
           }
-          if (sortdata[i].checkPerson === "主管科长每2周检查粮情") {
+          if (sortdata[i].enumId === 20) {
             console.log(this.data[i], "主管科长")
             this.sortData.splice(2, 1, sortdata[i])
           }
-          if (sortdata[i].checkPerson == "保管员每周检查粮情") {
+          if (sortdata[i].enumId == 19) {
             console.log(this.data[i], "保管员")
             this.sortData.splice(3, 1, sortdata[i])
           }
@@ -318,16 +433,24 @@ export default {
       }
     },
     // 除保管员外弹窗
-    open(val) {
+    open(val,index) {
       // console.log(this.$route.query, "保管员外的角色")
+      console.log(val, "val...")
+      console.log(index,'index')
+      this.data5.grainConditionRecord.depotId = this.depotId
+      this.data5.grainConditionRecord.houseId = this.houseId
+      this.data5.grainConditionRecord.enumId = val.enumId
+      console.log(val.enumId, "当前角色信息id")
+      console.log(this.grainKind, "角色类别字典")
+      var item = this.grainKind.find(item => item.enumId == val.enumId)
+      console.log(item.enumName, "item")
+      console.log(item,'item数据')
 
-      val.depotId = this.depotId
-      val.houseId = this.houseId
-      // console.log(val, "当前角色信息")
       // console.log(this.data2,'this.data2..........')
       const h = this.$createElement
       this.$msgbox({
-        title: "新增" + val.checkPerson,
+        // title: "新增" + val.checkPerson,
+        title: "新增" + item.enumName,
         /* message: h('p', null, [
             h('span', null, '内容可以是 '),
             h('i', { style: 'color: teal' }, 'VNode')
@@ -341,8 +464,16 @@ export default {
           if (action === "confirm") {
             instance.confirmButtonLoading = true
             // instance.type = success
-            val.recordStatus = 1
-            val.checkTime = getDateTimeNow()
+            this.data5.grainConditionRecord.recordStatus = 1
+            // operationTime
+            this.data5.grainConditionRecord.operationTime = getDateTimeNow()
+            console.log(this.sortData,'sortData')
+            console.log(this.sortData[index],'sortData[index]')
+            // 临时修改对应项的操作时间，造成数据实时更新的假象，实际更新需要重新刷新
+            this.sortData[index].operationTime = getDateTimeNow()
+            this.sortData[index].recordStatus = 1
+            this.sortData[index].anomalousStatus = 0
+
             instance.confirmButtonText = "新增中..."
             setTimeout(() => {
               done()
@@ -355,9 +486,14 @@ export default {
           }
         }
       }).then(action => {
-        addInfo(val)
+        // 此处新增参数应该改为data5模板
+        console.log(this.data5, "this.data5...")
+        addInfo(this.data5)
           .then(res => {
+            console.log(res, "res增")
             if (res.code == 200) {
+              // this.sortData.operationTime = this.data5.grainConditionRecord.operationTime
+
               console.log(this.houseId, "this.houseId")
               console.log(this.data2.houseId, "this.data2.houseId")
               let auditState = 4 //4 是已完成
@@ -384,15 +520,20 @@ export default {
                   })
               }
               console.log(res, "新增成功")
+              this.$message({
+                type: "success",
+                message: "新增成功"
+              })
+            } else {
+              this.$message({
+                type: "err",
+                message: res.msg
+              })
             }
           })
           .catch(err => {
             console.log(err)
           })
-        this.$message({
-          type: "success",
-          message: "新增成功 "
-        })
       })
     },
     // 新增按钮
@@ -405,8 +546,10 @@ export default {
       if (Object.keys(this.data2).length === 0) {
         //query为空是正常操作
         // console.log(id,'query为空')
-        if (row.checkPerson == "保管员每周检查粮情") {
-          row.checkTime = getDateTimeNow()
+        // if (row.checkPerson == "保管员每周检查粮情") {
+        if (row.enumId == 19) {
+          // operationTime
+          row.operationTime = getDateTimeNow()
           // console.log(row.checkTime,'time')
           // console.log(this.data2,' back: this.data2')
           this.$router.push({
@@ -414,8 +557,8 @@ export default {
             query: { type: type, pid: row.id, data: row }
           })
         } else {
-          // console.log("科长，副总，总经理")
-          this.open(row)
+          console.log(row, "科长，副总，总经理")
+          this.open(row,index)
         }
       } else if (Object.keys(this.data2).length !== 0) {
         //query不为空是从待办跳过来的
@@ -423,12 +566,14 @@ export default {
         // console.log(this.data2, "query 不 为空 ")
         // console.log(this.data2.workName, "query.workName............")
         // console.log(this.data2,'this.data2...')
-        if (row.checkPerson == "保管员每周检查粮情") {
+        if (row.enumId == 19) {
+          // 19是保管员
           // console.log(this.data2.workName,'this.data2.workName')
           // console.log(row.checkPerson,'row.checkPerson')
           if (this.data2.workName == "保管员每周粮情检查") {
             //保管员待办
-            row.checkTime = getDateTimeNow()
+            // operationTime
+            row.operationTime = getDateTimeNow()
             this.$router.push({
               path: "/grainCheck/addNewGrain",
               query: {
@@ -440,7 +585,7 @@ export default {
             })
           }
           // console.log('保管员')
-          /*         console.log(row, "row....")
+          /*
         console.log(this.data, "data111") */
           /*  row.checkTime = getDateTimeNow()
           // console.log(row.checkTime,'time')
@@ -450,7 +595,7 @@ export default {
           }) */
         } else {
           // console.log("科长，副总，总经理")
-          this.open(row)
+          this.open(row,index)
         }
       }
       // console.log(row,'111000')
@@ -505,7 +650,7 @@ export default {
   font-size: 13px;
 }
 .colorspano {
-  width: 140px;
+  width: 100px;
   height: 30px;
   background-color: #199856;
   display: inline-block;
@@ -514,7 +659,7 @@ export default {
   line-height: 30px;
 }
 .colorspant {
-  width: 140px;
+  width: 100px;
   height: 30px;
   background-color: #ffff00;
   display: inline-block;
@@ -523,10 +668,20 @@ export default {
   line-height: 30px;
 }
 .colorspanr {
-  width: 140px;
+  width: 100px;
   height: 30px;
   background-color: #ff9933;
   display: inline-block;
   border-radius: 5px;
 }
+.anomalousItem{
+  display: inline-block;
+  word-break: keep-all;
+  white-space: nowrap;
+  font-size: 12px;
+  font-weight: 800;
+  span {
+    padding-right: 5px;
+  }
+}
 </style>

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

@@ -59,9 +59,9 @@ export default {
             //库id
             depotId: 1,
             roleArr: [],
-            //33--主管科长   35---分管副总经理   34---总经理  54--分公司主管
+            //33--主管科长   35---分管副总经理   34---总经理  37--分公司主管
             //角色id
-            rolesId: "33,34,35,54",
+            rolesId: "33,34,35,37",
             //初始化审批人下拉选
             approverSelect: [],
             // 表格数据初始化
@@ -539,7 +539,7 @@ export default {
                             } else if (
                                 item.title.indexOf("分公司主管处室") != -1
                             ) {
-                                this.$set(item, "approverSelect", res.data[54])
+                                this.$set(item, "approverSelect", res.data[37])
                             }
                         })
                     }
@@ -553,9 +553,9 @@ export default {
             if (this.type == "tf") {
                 this.tableData = this.meVentilation
             } else if (this.type == "xzjh") {
-                this.tableData = this.fumigation
+                // this.tableData = this.fumigation
             } else if (this.type == "xzsq") {
-                this.tableData = this.fumigation1
+                // this.tableData = this.fumigation1
             } else if (this.type == "yjcg") {
                 this.tableData = this.drugPurchase
             } else if (this.type == "yjly") {