入库质量

shanXiPlatform/src/api/countQuality/index.js

@@ -118,4 +118,44 @@ export function  deletekcck( id ) {
     url: `/csc-szls-business/quantityQuality/authority_button/deleteById?id=${id}`,
     method: 'delete',
   })
-}
+}
+
+/* 入库质量管理 */
+// 全部记录&&查询
+export function  getIncomingInfo( data ) {
+  return request({
+    url: `/csc-szls-business/warehousingQuality/authority/getPage`,
+    method: 'post',
+    data:data
+  })
+}
+//根据id查询
+export function  getIncomingById( id ) {
+  return request({
+    url: `/csc-szls-business/warehousingQuality/authority/getById?id=${id}`,
+    method: 'get',
+  })
+}
+// 修改
+export function  updateInQuality( data ) {
+  return request({
+    url: `/csc-szls-business/warehousingQuality/authority_button/update`,
+    method: 'post',
+    data:data
+  })
+}
+// 删除
+export function  deleteInQuality( id ) {
+  return request({
+    url: `/csc-szls-business/warehousingQuality/authority_button/deleteById?id=${id}`,
+    method: 'delete',
+  })
+}
+// 新增
+export function  saveInQuality( data ) {
+  return request({
+    url: `/csc-szls-business/warehousingQuality/authority_button/add`,
+    method: 'post',
+    data:data
+  })
+}

shanXiPlatform/src/router/index.js

@@ -673,24 +673,25 @@ export const constantRoutes = [
         resourceCode:174,
       },
 
-      //  数量质量/库存质量管理
+
+      // 数量质量/入库质量
       {
         path: 'warehousingQuality/StorageQuality',
         component: () => import('@/views/countQuality/warehousingQuality/StorageQuality'),
         name: 'StorageQuality',
         resourceCode:174,
-        meta: { title: '入库质量', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
-        
+        meta: { title: '入库质量', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: true }
+
       },
       {
         path: 'warehousingQuality/steps',
         component: () => import('@/views/countQuality/warehousingQuality/steps'),
         name: 'steps',
         hidden: true,
-        meta: { title: '新增', icon: 'dashboard', affix: false/* , noCache: true, relation: 'house', istable: false */ }
+        meta: { title: '新增', icon: 'dashboard', affix: false , noCache: true, relation: 'house',/* istable: false */ }
       },
      /*  {
-        // 数量质量/入库质量
+
 
         path: 'warehousingQuality',
         // component: () => import('@/views/countQuality/warehousingQuality/StorageQuality'),
@@ -716,7 +717,7 @@ export const constantRoutes = [
             },
         ]
       }, */
-
+       //  数量质量/库存质量管理
       {
         path: 'inventory',
         component: storeTabs,

shanXiPlatform/src/views/countQuality/inventory/allinventoryQuality.vue

@@ -78,10 +78,10 @@ export default {
             houseId: this.$store.state.houseId
         }
     },
-   
+
     created() {
         this.id = JSON.parse(getUser()).depotId
-        this.name = JSON.parse(getUser()).depotName
+        this.depotName = JSON.parse(getUser()).depotName
         if (this.$route.query.state == "more") {
             this.qType = this.$route.query.qtype
         }
@@ -238,4 +238,4 @@ export default {
     margin-right: 20px;
     text-align: right;
 }
-</style>
+</style>

shanXiPlatform/src/views/countQuality/warehousingQuality/StorageQuality.vue

@@ -1,27 +1,21 @@
-<!--
- * @Author: your name
- * @Date: 2021-04-13 10:48:09
- * @LastEditTime: 2021-04-15 16:41:54
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \csc-szls-vue\shanXiPlatform\src\views\countQuality\warehousingQuality\StorageQuality.vue
--->
+
 <template>
   <div class="global">
     <div class="contentContainer">
       <div class="top">入库质量</div>
       <div class="container">
         <div class="header">
-          <el-form :inline="true" :model="query" class="demo-form-inline">
+          <el-form :inline="true" class="demo-form-inline">
             <el-form-item label="检测时间">
               <el-date-picker
-                v-model="query.value1"
+                v-model="time"
+                @change="timechange"
                 type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
@@ -50,7 +44,7 @@
               type="success"
               icon="el-icon-circle-plus"
               plain
-              @click="add()"
+              @click="add(1)"
               >新增</el-button
             >
           </div>
@@ -65,72 +59,78 @@
           :header-cell-style="{ background: '#f8f8f8' }"
         >
           <el-table-column
-            :index="indexMethod"
-            type="index"
+            prop="creationTime"
             align="center"
             label="记录时间"
             width="150px"
           >
           </el-table-column>
 
-          <el-table-column prop="type" label="检测结果">
-            <template>
+          <el-table-column prop="checkType" align="center" label="检测结果">
+            <template slot-scope="scope">
               <div class="steps">
-                <!-- :active="stepActive" direction="horizontal"-->
                 <el-steps
+                  v-if="scope.row.stepTitle"
                   align-center
-                  :active="stepActive"
-                  finish-status="success"
+                  :active="scope.row.checkType"
                   direction="horizontal"
                 >
-                  <!--  v-for="(item, index) in totalData"
-            :key="index"
-            @click.native="stepClick(index)" -->
-                  <el-step id="el_step" title="1/3">
+                  <el-step
+                    id="el_step"
+                    v-for="(item, index) in scope.row.stepTitle"
+                    :title="item"
+                    :key="index"
+                  >
                     <svg-icon
                       class="icon_wai"
                       slot="icon"
-                      icon-class="finished"
+                      icon-class="NotStarted"
+                      v-if="scope.row.qualityChildrens.length < index"
                     />
-                    <!-- <svg-icon
-             class='icon_wai'
-              slot="icon"
-              icon-class="current"
-              v-if="stepActive == index"
-            />
-            <svg-icon
-             class='icon_wai'
-              slot="icon"
-              icon-class="finished"
-              v-if="stepActive > index"
-            /> -->
-                  </el-step>
-                  <el-step title="1/2">
                     <svg-icon
                       class="icon_wai"
                       slot="icon"
                       icon-class="current"
+                      v-if="scope.row.qualityChildrens.length == index"
                     />
-                  </el-step>
-                  <el-step title="2/3">
                     <svg-icon
                       class="icon_wai"
                       slot="icon"
-                      icon-class="NotStarted"
+                      icon-class="finished"
+                      v-if="scope.row.qualityChildrens.length > index"
                     />
+                    <!-- <i class="el-icon-eleme" v-if="item == '巡查'"></i> -->
                   </el-step>
-                  <el-step title="自验收">
+                </el-steps>
+                <el-steps
+                  v-else
+                  align-center
+                  :active="scope.row.checkType"
+                  direction="horizontal"
+                >
+                  <el-step
+                    id="el_step"
+                    v-for="(item, index) in stepTitle"
+                    :title="item"
+                    :key="index"
+                  >
                     <svg-icon
                       class="icon_wai"
                       slot="icon"
                       icon-class="NotStarted"
+                      v-if="scope.row.qualityChildrens.length < index"
                     />
-                  </el-step>
-                  <el-step title="质检验收">
                     <svg-icon
                       class="icon_wai"
                       slot="icon"
-                      icon-class="NotStarted"
+                      icon-class="current"
+                      v-if="scope.row.qualityChildrens.length == index"
+                    />
+                    <svg-icon
+                      class="icon_wai"
+                      slot="icon"
+                      icon-class="finished"
+                      v-if="scope.row.qualityChildrens.length > index"
                     />
                   </el-step>
                 </el-steps>
@@ -140,30 +140,26 @@
           <!-- <el-table-column prop="applyTime" label="时间" align="center">
           </el-table-column> -->
           <el-table-column
-            prop="auditState"
+            prop="qualityState"
             label="状态"
             align="center"
             width="150px"
           >
             <template slot-scope="scope">
-              <!-- <div v-if="scope.row.auditState == 0">待审批</div>
-              <div v-if="scope.row.auditState == 1">待审批</div>
-              <div v-if="scope.row.auditState == 2">审批不通过</div>
-              <div v-if="scope.row.auditState == 3">进行中</div>-->
-              <div v-if="scope.row.auditState == 4">已完成</div>
-              <div>进行中</div>
+              <div v-if="scope.row.qualityState == 1">已完成</div>
+              <div
+                v-if="
+                  scope.row.qualityState == 0 || scope.row.qualityState == null
+                "
+              >
+                进行中
+              </div>
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="operation"
-            label="操作"
-            align="center"
-            width="300px"
-          >
+          <el-table-column label="操作" align="center" width="300px">
             <template slot-scope="scope">
               <el-button
-                v-if="$tools.IsPermission(205)"
                 size="mini"
                 type="detailbtn"
                 @click="handleCheck(3, scope.$index, scope.row)"
@@ -174,13 +170,7 @@
                 size="mini"
                 type="editbtn"
                 @click="handleEdit(2, scope.$index, scope.row)"
-                v-if="
-                  scope.row.auditState != 0 &&
-                    scope.row.auditState != 4 &&
-                    scope.row.auditState != 1 &&
-                    scope.row.auditState != 2 &&
-                    $tools.IsPermission(204)
-                "
+                v-if="scope.row.qualityState != 1"
                 >修改</el-button
               >
               <el-button
@@ -193,11 +183,11 @@
             </template>
           </el-table-column>
         </el-table>
+        <!-- :page-count="5" -->
         <el-pagination
           background
           @size-change="sizeChange"
           @current-change="handleCurrentChange"
-          :page-count="5"
           :page-sizes="[10, 20, 30, 40]"
           :page-size="pagination.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
@@ -210,6 +200,7 @@
 
 <script>
 import Pagination from "@/components/Pagination"
+import { getIncomingInfo, deleteInQuality } from "@/api/countQuality/index"
 export default {
   components: { Pagination },
   data() {
@@ -219,6 +210,7 @@ export default {
       //初始化步骤高亮显示到第几步
       stepActive: 0,
       //步骤1
+      stepTitle: ["1/3", "1/2", "2/3", "自验收", "质检中心验收"],
       //存储用户信息
       userInfo: {},
       //仓房编号
@@ -226,43 +218,172 @@ export default {
       //库编号
       depotId: this.$store.state.depotId,
       //类型
-      type: "yjly",
-      value: "",
-      query: {
-        // startTime: "",
-        // endTime: "",
-        value1: ""
-      },
-      //分页
+      time: [],
+      startTime: "",
+      endTime: "",
 
+      //分页
       pagination: {
         //当前页数
-        curPage: 1,
+        pageIndex: 1,
         //每页显示的条数
-        pageSize: 10,
+        pageSize: 20,
         //总条数
         total: 0
       },
       // 列表数据
-      StorageData: [
-        {
-          time: "2021-034-13",
-          check: ""
-        }
-      ]
+      StorageData: []
+    }
+  },
+  created() {
+    // this.getIncomingInfoData()
+  },
+  mounted() {
+    this.getIncomingInfoData()
+  },
+  computed: {
+    HouseId() {
+      return this.$store.state.houseId
+    }
+  },
+  watch: {
+    HouseId: function(val) {
+      this.houseId = val
+      // console.log(this.houseId, "houseId 改变了")
+      this.getIncomingInfoData()
     }
   },
-  methods:{
+  methods: {
+    timechange(val) {
+      this.startTime = val[0]
+      this.endTime = val[1]
+    },
+    sizeChange(v) {
+      this.pagination.pageSize = v
+      // this.getList()
+      this.getIncomingInfoData()
+    },
+    handleCurrentChange(v) {
+      this.pagination.pageIndex = v
+      // this.getList()
+      this.getIncomingInfoData()
+    },
     // 新增流程
-    add()  {
+    add(type) {
+      this.$router.push({
+        path: "steps",
+        query: { type: type }
+      })
+    },
+    // 修改流程
+    handleEdit(type, index, data) {
       this.$router.push({
         path: "steps",
-       /*  query: {
-          type: type,
-        }, */
+        query: { type: type, data: data }
       })
+    },
+    // 查看流程
+    handleCheck(type, index, data) {
+      this.$router.push({
+        path: "steps",
+        query: { type: type, data: data }
+      })
+    },
+
+    // 获取列表数据
+    getIncomingInfoData() {
+      var condition = {
+        depotId: this.depotId,
+        warehouseId: this.houseId,
+        creationTimeStart: this.startTime,
+        creaetionTimeEnd: this.endTime
+      }
+      var data = {
+        pageIndex: this.pagination.pageIndex,
+        pageSize: this.pagination.pageSize,
+        condition: JSON.stringify(condition)
+      }
+      getIncomingInfo(data)
+        .then(res => {
+          if (res.code == 200) {
+            this.StorageData = res.data.records
+            this.pagination.pageSize = res.data.size
+            this.pagination.total = res.data.total
+            // 遍历为每一项添加各自不同的步骤
+            for (let i = 0; i < this.StorageData.length; i++) {
+              // 此处的数组赋值要进行深拷贝
+              this.StorageData[i].stepTitle = JSON.parse(
+                JSON.stringify(this.stepTitle)
+              )
+              for (
+                let j = 0;
+                j < this.StorageData[i].qualityChildrens.length;
+                j++
+              ) {
+                if (
+                  this.StorageData[i].qualityChildrens[j].checkName.indexOf(
+                    "巡"
+                  ) != -1
+                ) {
+                  this.StorageData[i].stepTitle.splice(
+                    j,
+                    0,
+                    this.StorageData[i].qualityChildrens[j].checkName
+                  )
+                }
+              }
+            }
+          } else {
+            console.log("其他错误")
+          }
+          console.log(res, "res 初始化数据返回")
+        })
+        .catch(err => {
+          console.log(err, "err")
+        })
+    },
+    //删除
+    handleDelete(index, data) {
+      deleteInQuality(data.id)
+        .then(res => {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          })
+          this.getIncomingInfoData()
+        })
+        .catch(res => {
+          console.log(res, "删除失败")
+        })
+    },
+    clear() {
+      // this.qType = ""
+      this.time = []
+      this.statTime = ""
+      this.endTime = ""
+      // this.getList()
+    },
+    search() {
+      var condition = {
+        depotId: this.depotId,
+        warehouseId: this.houseId,
+        creationTimeStart: this.startTime,
+        creaetionTimeEnd: this.endTime
+      }
+      var data = {
+        pageIndex: this.pagination.pageIndex,
+        pageSize: this.pagination.pageSize,
+        condition: JSON.stringify(condition)
+      }
+      getIncomingInfo(data)
+        .then(res => {
+          console.log(res, "查询返回数据")
+        })
+        .catch(err => {
+          console.log(err, "查询错误返回")
+        })
     }
-  },
+  }
 }
 </script>
 

shanXiPlatform/src/views/countQuality/warehousingQuality/steps.vue

@@ -2,92 +2,72 @@
   <div class="container">
     <div id="mainRight">
       <div class="steps">
-        <!-- :active="stepActive" direction="horizontal"-->
-        <el-steps
-          align-center
-          :active="stepActive"
-          finish-status="success"
-          direction="horizontal"
-        >
-          <!--  v-for="(item, index) in totalData"
+        <el-steps align-center :active="active" direction="horizontal">
+          <el-step
+            id="el_step"
+            :title="item"
+            v-for="(item, index) in stepTitle"
             :key="index"
-            @click.native="stepClick(index)" -->
-          <el-step id="el_step" title="1/3">
-            <svg-icon class="icon_wai" slot="icon" icon-class="finished" />
-            <!-- <svg-icon
-             class='icon_wai'
+          >
+            <i class="el-icon-eleme" v-if="item == '巡查'"></i>
+
+            <svg-icon
+              class="icon_wai"
+              slot="icon"
+              icon-class="NotStarted"
+              v-if="active < index"
+            />
+            <svg-icon
+              class="icon_wai"
               slot="icon"
               icon-class="current"
-              v-if="stepActive == index"
+              v-if="active == index"
             />
             <svg-icon
-             class='icon_wai'
+              class="icon_wai"
               slot="icon"
               icon-class="finished"
-              v-if="stepActive > index"
-            /> -->
-          </el-step>
-          <el-step title="1/2">
-            <svg-icon class="icon_wai" slot="icon" icon-class="current" />
-          </el-step>
-          <el-step title="2/3">
-            <svg-icon class="icon_wai" slot="icon" icon-class="NotStarted" />
-          </el-step>
-          <el-step title="自验收">
-            <svg-icon class="icon_wai" slot="icon" icon-class="NotStarted" />
-          </el-step>
-          <el-step title="质检验收">
-            <svg-icon class="icon_wai" slot="icon" icon-class="NotStarted" />
+              v-if="active > index"
+            />
           </el-step>
+          <el-button
+            type="savebtn"
+            v-show="checkShow"
+            class="addcheck"
+            @click="add"
+            >添加巡查</el-button
+          >
         </el-steps>
       </div>
       <div>
         <el-table
-          :header-row-class-name="goodsInfo"
-          :cell-class-name="goodsInfo"
+          :data="personData1"
           border
-          :data="personData"
-          highlight-current-row
-          @current-change="handleCurrentChange"
-          style="width: 100%"
           :header-cell-style="{ background: '#f8f8f8' }"
-        >
+          :row-style="{ height: '60px' }"
+          :cell-style="{ padding: '0' }"
+          ref="personData1"
+          >
           <el-table-column
-            property="qtypeName"
+            v-if="type == 1 || type == 2"
+            prop="checkType"
             label="检查类型"
             align="center"
-            width='200'
-          ></el-table-column>
-         <el-table-column
-            property="checkTime"
-            style="padding:0;"
-            label="记录时间"
+            >{{ (checkType = this.stepTitle[this.active]) }}</el-table-column
+          >
+          <el-table-column
+            v-if="type == 3"
+            prop="checkName"
+            label="检查类型"
             align="center"
-
           >
-            <template>
-              <p
-                style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
-              >
-            1
-              </p>
-              <p
-                style="height:45px;line-height:45px;margin:0; padding-top:7px;border-top:1px solid #dfe6ec;border-bottom:1px solid #dfe6ec;"
-              >
-2
-              </p>
-              <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
-3
-              </p>
-            </template>
           </el-table-column>
           <el-table-column
-            property="ppost"
-            style="padding:0;"
-            label="检查项"
+            prop="creationTime"
+            label="记录时间"
             align="center"
-
-          >
+          ></el-table-column>
+          <el-table-column label="检查项" align="center" style="padding:0;">
             <template>
               <p
                 style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
@@ -105,133 +85,358 @@
             </template>
           </el-table-column>
           <el-table-column
-
-            property="operation"
             label="选项"
             align="center"
-            min-width='250'
+            style="padding:0;"
+            min-width="280px"
           >
-             <template slot-scope="scope">
-              <!-- <el-radio-group
-                v-model="scope.row.c"
-                @change="radioChange(scope.$index, scope.row)"
-              >
-                <el-radio :label="0">达标.宜存</el-radio>
-                <el-radio :label="1">不达标.宜存</el-radio>
-                <el-radio :label="2">不达标.不宜存</el-radio>
-              </el-radio-group> -->
+            <template slot-scope="scope">
               <p
                 style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
               >
                 <el-radio-group
-                v-model="scope.row.c"
-                @change="radioChange(scope.$index, scope.row)"
-              >
-                <el-radio :label="0">达标.宜存</el-radio>
-                <el-radio :label="1">不达标.宜存</el-radio>
-                <el-radio :label="2">不达标.不宜存</el-radio>
-              </el-radio-group>
+                  v-model="scope.row.wquality"
+                  @change="radioChange1(scope.$index, scope.row)"
+                  :disabled="isDetail"
+                >
+                  <el-radio :label="0">达标.宜存</el-radio>
+                  <el-radio :label="1">不达标.宜存</el-radio>
+                  <el-radio :label="2">不达标.不宜存</el-radio>
+                </el-radio-group>
               </p>
               <p
                 style="height:45px;line-height:45px;margin:0; padding-top:7px;border-top:1px solid #dfe6ec;border-bottom:1px solid #dfe6ec;"
               >
                 <el-radio-group
-                v-model="scope.row.c"
-                @change="radioChange(scope.$index, scope.row)"
-              >
-                <el-radio :label="0">达标.宜存</el-radio>
-                <el-radio :label="1">不达标.宜存</el-radio>
-                <el-radio :label="2">不达标.不宜存</el-radio>
-              </el-radio-group>
+                  v-model="scope.row.wcharacter"
+                  @change="radioChange1(scope.$index, scope.row)"
+                  :disabled="isDetail"
+                >
+                  <el-radio :label="0">达标.宜存</el-radio>
+                  <el-radio :label="1">不达标.宜存</el-radio>
+                  <el-radio :label="2">不达标.不宜存</el-radio>
+                </el-radio-group>
               </p>
               <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
                 <el-radio-group
-                v-model="scope.row.c"
-                @change="radioChange(scope.$index, scope.row)"
-              >
-                <el-radio :label="0">达标.宜存</el-radio>
-                <el-radio :label="1">不达标.宜存</el-radio>
-                <el-radio :label="2">不达标.不宜存</el-radio>
-              </el-radio-group>
+                  v-model="scope.row.toxinIndex"
+                  @change="radioChange1(scope.$index, scope.row)"
+                  :disabled="isDetail"
+                >
+                  <el-radio :label="0">达标.宜存</el-radio>
+                  <el-radio :label="1">不达标.宜存</el-radio>
+                  <el-radio :label="2">不达标.不宜存</el-radio>
+                </el-radio-group>
               </p>
             </template>
           </el-table-column>
         </el-table>
       </div>
+      <div class="btns">
+        <el-button type="danger" v-show="isShow">删除</el-button>
+        <el-button type="cancel" @click="goBack()">返回</el-button>
+        <el-button
+          class="saveBtn"
+          type="savebtn"
+          @click="save()"
+          :loading="loading"
+          v-if="type == 1"
+          >新增</el-button
+        >
+        <el-button
+          class="saveBtn"
+          type="savebtn"
+          @click="edit()"
+          :loading="loading"
+          v-if="type == 2"
+          >修改</el-button
+        >
+      </div>
     </div>
   </div>
 </template>
 <script>
-import { getkccknew } from "@/api/countQuality/index"
+import { getNowFormatDateone } from "@/utils"
+import {
+  /* getkccknew, */ saveInQuality,
+  updateInQuality
+} from "@/api/countQuality/index"
 export default {
   data() {
     return {
-       query: {
-        roleId: ""
-      },
-      personData: [
-        {
-          createTime: "",
-          d: "质量",
-          c: ""
-        },
-        {
-          createTime: "",
-          d: "品质",
-          c: ""
-        },
+      type: null, // 1：新增, 2:修改，3：查看
+      loading: false,
+      isShow: false,
+      isDetail: false, //查看是选项不能被选择
+      active: 0,
+      indexInfoList: [],
+      stepTitle: ["1/3", "1/2", "2/3", "自验收", "质检中心验收"],
+      // stepTitle1: [],
+
+      checkType: "1/3",
+      creationTime: "", // 时间转换中介
+      personData1: [
         {
-          createTime: "",
-          d: "毒素指标",
-          c: ""
+          checkType: "",
+          creationTime: "",
+          wquality: null, //质量（0达标易存，1不达标易存，2不达标不易存
+          wcharacter: null, //品质（0达标易存，1不达标易存，2不达标不易存
+          toxinIndex: null //毒素指标（0达标易存，1不达标易存，2不达标不易存
         }
       ],
+      model: {
+        checkName: "", //检测名称当前处于类型
+        checkType: null, // 检测类型（0:1/3,1:1/2,2:2/3,3：自验收，5：质检中心验收
+        childrenId: null,
+        creationTime: "", //创建时间
+        depotId: this.$store.state.depotId, //库id
+        depotName: this.$store.state.depotName, //库名称
+        endTime: "", //结束时间
+        id: null, //
+        qualityState: null, //0：进行中，1：完成
+        saveType: null, //标识是否第一次新增，0代表第一次，1代表n次
+        toxinIndex: null, //毒素指标（0达标易存，1不达标易存，2不达标不易存
+        wCharacter: null, //品质（0达标易存，1不达标易存，2不达标不易存
+        wIndex: null, //内置序列号
+        wQuality: null, //质量（0达标易存，1不达标易存，2不达标不易存
+        warehouseId: Number(this.$store.state.houseId), //仓房id
+        warehouseName: this.$store.state.houseName, //仓房名称
+        warehouseingId: null //入库质量表id
+      },
+      // stepActive:true,
       depotId: "",
       depotName: "",
-      loading: false,
-      model: {
-        ccharacter: "",
-        cquality: "",
-        ctoxinIndex: "",
-        depotId: "",
-        depotYpte: 1,
-        qid: "",
-        qtype: "",
-        warehouseId: "",
-        saveState: ""
-      }
+      isok: false
+      // checkShow:(this.active == 0 || this.stepTitle.length-1)?false:true,
+      // checkShow:false //新增巡查按钮显示控制
+    }
+  },
+  computed: {
+    // 监听
+    checkShow: function() {
+      return this.active == 0 || this.active == this.stepTitle.length - 1
+        ? false
+        : true
     }
-      /* personData: [],
-      total: 0,
-      id: "",
-      depotId: "",
-      warehouseId: "",
-      depotYpte: 1 */
-
   },
   created() {
     // this.depotId = JSON.parse(getUser()).depotId
     // this.warehouseId = this.$store.state.houseId
-    this.getList()
+    // this.getList()
+  },
+  mounted() {
+    let routeParams = this.$route.query
+    this.type = routeParams.type
+    // 1：新增, 2:修改，3：查看
+    if (this.type == 1) {
+      // 新增
+      this.model.saveType = 0 //0代表第一次新增，1代表n次
+    } else if (this.type == 2) {
+      // 修改
+      let editData = routeParams.data.qualityChildrens
+      this.active = routeParams.data.qualityChildrens.length - 1
+      this.model.saveType = 1 //0代表第一次新增，1代表n次
+      this.model.checkName = editData[editData.length - 1].checkName
+      this.model.id = routeParams.data.id
+      this.model.childrenId =
+        routeParams.data.qualityChildrens[this.active].childrenId
+      this.personData1[0].wquality =
+        routeParams.data.qualityChildrens[this.active].wquality
+      this.personData1[0].toxinIndex =
+        routeParams.data.qualityChildrens[this.active].toxinIndex
+      this.personData1[0].wcharacter =
+        routeParams.data.qualityChildrens[this.active].wcharacter
+      this.personData1[0].creationTime =
+        routeParams.data.qualityChildrens[this.active].creationTime
+      this.stepTitle = JSON.parse(JSON.stringify(routeParams.data.stepTitle))
+    } else if (this.type == 3) {
+      // 查看
+      this.personData1 = routeParams.data.qualityChildrens
+      let editData = routeParams.data.qualityChildrens
+      this.active = editData[editData.length - 1].checkType + 1
+      this.isDetail = true //单选项设为不能选择
+      this.stepTitle = routeParams.data.stepTitle
+      this.active = routeParams.data.qualityChildrens.length - 1
+
+      console.log(this.personData1, "查看步骤")
+    }
   },
   methods: {
-    radioChange(index, row) {
-      this.personData[index].createTime = getNowFormatDateone()
-      if (row.d == "质量") {
-        this.model.cquality = row.c
-      } else if (row.d == "品质") {
-        this.model.ccharacter = row.c
-      } else if (row.d == "毒素指标") {
-        this.model.ctoxinIndex = row.c
+    // 合并行
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0 || columnIndex === 1) {
+        if (rowIndex % 3 === 0) {
+          return {
+            rowspan: 3,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
       }
     },
+    //单选
+    radioChange1(index, row) {
+      this.personData1[index].creationTime = getNowFormatDateone()
+      this.creationTime = this.getISOString()
+      this.isok = true //  该步骤操作过，设置可以保存
+    },
+
+    getISOString() {
+      var t = new Date()
+      return t.toISOString()
+    },
+    // 修改
+    edit() {
+      this.model.creationTime = this.creationTime
+      // this.model.saveType = 0 //0代表第一次新增，1代表n次
+      this.model.wQuality = this.personData1[0].wquality
+      this.model.wCharacter = this.personData1[0].wcharacter
+      this.model.toxinIndex = this.personData1[0].toxinIndex
+      // 转换checkType 与checkName
+
+      let checktype = this.stepTitle[this.active]
+      switch (checktype) {
+        case "1/3":
+          this.model.checkType = 0
+          break
+        case "1/2":
+          this.model.checkType = 1
+          break
+        case "2/3":
+          this.model.checkType = 2
+          break
+        case "自验收":
+          this.model.checkType = 3
+          break
+        case "质检中心验收":
+          this.model.checkType = 4
+          break
+        case "巡查":
+          this.model.checkType = 5
+          break
+      }
+      // 判断状态
+      if (this.active < this.stepTitle.length - 1) {
+        this.model.qualityState = 0 //状态为进行中
+      } else if (this.active == this.stepTitle.length - 1) {
+        this.model.qualityState = 1 //状态为已完成
+      }
+      updateInQuality(this.model)
+        .then(res => {
+          console.log(res, "更新数据返回")
+        })
+        .catch(err => {
+          console.loh(err, "错误信息返回")
+        })
+    },
+    // 新增保存
+    save() {
+      this.loading = true
+      // 通过checkName判断checkType
+      let checktype = this.stepTitle[this.active]
+      switch (checktype) {
+        case "1/3":
+          this.model.checkType = 0
+          break
+        case "1/2":
+          this.model.checkType = 1
+          break
+        case "2/3":
+          this.model.checkType = 2
+          break
+        case "自验收":
+          this.model.checkType = 3
+          break
+        case "质检中心验收":
+          this.model.checkType = 4
+          break
+        case "巡查":
+          this.model.checkType = 5
+          break
+      }
+      // 新增
+      if (this.type == 1) {
+        if (this.active < this.stepTitle.length - 1) {
+          this.model.qualityState = 0 //状态为进行中
+        } else if (this.active == this.stepTitle.length - 1) {
+          this.model.qualityState = 1 //状态为已完成
+        }
+        // if(this.stepTitle[this.active] )
+        this.model.checkName = this.stepTitle[this.active]
+        // this.model.checkType = this.stepTitle[this.active]
+        this.model.creationTime = this.creationTime
+        // this.model.saveType = 0 //0代表第一次新增，1代表n次
+        this.model.wQuality = this.personData1[0].wquality
+        this.model.wCharacter = this.personData1[0].wcharacter
+        this.model.toxinIndex = this.personData1[0].toxinIndex
+
+        if (this.isok) {
+          saveInQuality(this.model)
+            .then(res => {
+              if (res.code == 200) {
+                this.loading = false
+                this.next() // 该步骤新增成功后步骤+1
+                this.model.id = res.data.id
+                this.model.saveType = 1 // 下一步需要将此字段改为第n次新增
+
+                this.personData1[0].wquality = null
+                this.personData1[0].wcharacter = null
+                this.personData1[0].toxinIndex = null
+                this.personData1[0].creationTime = ""
+              }
+            })
+            .catch(res => {
+              this.$message("新增失败！")
+              this.loading = false
+            })
+        } else {
+          this.loading = false
+          this.$message({
+            message: "不能保存空的步骤，请记录后再进行保存！",
+            type: "warning"
+          })
+        }
+      } else if (this.type == 2) {
+        // 修改
+      } else if (this.type == 3) {
+      }
+    },
+    // 查看
+    query() {},
+    // 删除
+    delete() {},
+    // 下一步
+    next() {
+      // console.log(this.active, "active")
+      if (this.active++ >= this.stepTitle.length - 1) {
+        // this.active = 0
+        this.$router.push({
+          path: "/countQuality/warehousingQuality/StorageQuality"
+        })
+      }
+      // this.stepTitle1 = this.stepTitle;
+    },
+    // 添加巡查
+    add() {
+      this.stepTitle.splice(this.active, 0, "巡查")
+    },
+    //点击返回按钮
+    goBack() {
+      this.$router.push({
+        path: "/countQuality/warehousingQuality/StorageQuality"
+      })
+    },
     goodsInfo(row) {
       if (row.columnIndex == 3 || row.columnIndex == 2) {
         return "goodsInfo"
       }
     },
 
-    getList() {
+    /* getList() {
       getkccknew(this.depotId, "1").then(res => {
         this.personData = res.data
         this.total = res.data.total
@@ -256,7 +461,7 @@ export default {
           state: "more"
         }
       })
-    },
+    }, */
     handleCurrentChange() {}
   }
 }
@@ -265,7 +470,7 @@ export default {
 .goodsInfo {
   padding: 0 !important;
 }
-.goodsInfo .cell {
+.el-table .cell {
   padding: 0;
   overflow: unset;
 }
@@ -273,16 +478,26 @@ export default {
   width: 45px;
   height: 45px;
 }
+.el-step.is-horizontal .el-step__line {
+  top: 21px !important;
+}
 </style>
 <style lang="scss" scoped>
 .container {
-  height: 100%;
+  height: calc(100vh - 165px);
+  overflow-y: scroll;
+  overflow-x: hidden;
   display: flex;
+  // margin-right: 13px;
   #mainLeft {
     width: 300px;
-    height: calc(100vh - 200px);
+
     border: 1px solid #e6e6e6;
   }
+  .content {
+    height: 100%;
+    // overflow-y: auto;
+  }
   #mainRight {
     margin-left: 20px;
     width: calc(99%);
@@ -312,7 +527,6 @@ export default {
 .steps {
   min-height: 80px;
   margin: 10px 0;
-  // line-height:80px;
   .iconfont {
     font-size: 55px;
   }
@@ -323,40 +537,6 @@ export default {
     width: 40px;
     height: 40px;
   }
-  .el-step__head.is-process {
-    border-color: #dedede;
-  }
-  .el-step__head.is-finish {
-    border-color: #285edf;
-  }
-  .el-step__title.is-process {
-    color: #037d41;
-  }
-  .el-step__title.is-wait {
-    color: #16261e;
-  }
-  .el-step__title.is-finish {
-    color: #037d41;
-  }
-  .el-step__description.is-process {
-    color: #2d2f33;
-  }
-
-  .el-step__description.is-wait {
-    color: #b4bccc;
-  }
-
-  .el-step__description.is-success {
-    color: #409167;
-  }
-
-  .el-step__description.is-error {
-    color: #b3450e;
-  }
-
-  .el-step__description.is-finish {
-    color: #262729;
-  }
 }
 
 .icon_wai {
@@ -373,4 +553,15 @@ export default {
   margin-right: 20px;
   text-align: right;
 }
+.btns {
+  /*   position: relative;
+  bottom: 150px;
+  right: 50px; */
+  text-align: right;
+  margin: 40px 10px 0 0;
+}
+.addcheck {
+  margin-right: 15px;
+  margin-top: 15px;
+}
 </style>

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceManagement/detailList.vue

@@ -96,7 +96,7 @@
                   scope.row.auditState != 0 &&
                   scope.row.auditState != 4 &&
                   scope.row.auditState != 1 &&
-                  scope.row.auditState != 2 
+                  scope.row.auditState != 2
                 "
                 >修改</el-button
               >
@@ -174,6 +174,7 @@ export default {
         },
       })
     },
+
     //查看
     handleCheck(type, index, row) {
       if (row.auditState == 4) {
@@ -257,7 +258,7 @@ export default {
         type: this.type,
         startTime: this.query.value1[0],
         endTime: this.query.value1[1],
-       
+
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -293,7 +294,7 @@ export default {
 
     //查询
     search() {
-      
+
       this.tfList()
     },
     //当前页发生变化时

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceManagement/index.vue

@@ -51,7 +51,7 @@
         <el-table-column prop="recvDetailsInfo" label="设备状态" align="center" />
         <el-table-column prop="operation" label="查看" align="center" width="200px" fixed="right">
           <template slot-scope="scope">
-            <span class="buttonSpan"  @click="handleDetail(scope.row)">管理记录》</span>
+            <span class="buttonSpan"  @click="handleDetail(scope.row)">管理记录 》</span>
           </template>
         </el-table-column>
       </el-table>
@@ -175,12 +175,12 @@ export default {
         this.$router.push({ name: "Addnotice",query: { state: 'add',orgType: '1' } })
       }else{
         this.$router.push({ name: "Addnotice",query: { state: 'add',orgType: '2' } })
-      } 
+      }
     },
-    // 查看   
+    // 查看
     handleDetail(row) {
       this.$router.push({ name: "DeviceManagementDlist",query: { }})
-      
+
     },
     // // 编辑
     // handleEdit(row) {

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceManagement/steps.vue

@@ -34,7 +34,7 @@
           <div class="tf_title">
             <i class="iconfont iconshu"></i>
             <span v-if="stepActive == 0 || step == 1">流程（设施维修计划审批）</span>
-            <span v-if="stepActive == 1 || step == 2">流程（设施维修预算审批）</span> 
+            <span v-if="stepActive == 1 || step == 2">流程（设施维修预算审批）</span>
           </div>
           <div class="tf_title_right">
             <span style="margin-right:10px">提交给总经理和分公司审批</span>
@@ -415,7 +415,7 @@ export default {
             //   process: this.process,
             // })
             this.main_id = this.totalData[0].step.id
-            console.log(this.totalData, "this.totalData..")
+            // console.log(this.totalData, "this.totalData..")
             this.tableShow()
           }
         })
@@ -565,7 +565,7 @@ export default {
                 this.processActive = i
               }
               this.process.push(ele)
-            }  
+            }
             if (this.process[0].content == 0) {
               this.process[0].content = this.userInfo.uid
             } else {
@@ -618,9 +618,9 @@ export default {
             this.stepActive = this.stepActive + 1
             this.processId = this.$route.query.processId
             this.step = this.stepActive + 1
-            this.totalData = [] 
-            this.tableData = []   
-            this.process = [] 
+            this.totalData = []
+            this.tableData = []
+            this.process = []
             this.subList = []
             this.getCheckList()
           }else{
@@ -677,14 +677,14 @@ export default {
       this.button = "暂存"
     }
   },
-} 
+}
 </script>
 <style lang="scss" scoped>
 .mainContainer {
   background: #fff;
   padding: 10px;
    height: calc(100% - 40px);
- 
+
   .div_parent{
   height:100%;
   overflow-y:auto ;
@@ -740,12 +740,12 @@ export default {
     display: inline-block;
   }
   .tf_title_right{
-    display: inline-block;
+    // display: inline-block;
     float: right;
   }
-  .el-steps {
+/*   .el-steps {
   // height: 330px !important;
-}
+} */
 
 .icon_wai{
   width:3em;

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/addType.vue

@@ -475,7 +475,7 @@ export default {
     this.data1.equipFacilities.depotName = userInfo.depotName
 
     let routeParams = this.$route.query
-    console.log(routeParams, "routeParams")
+    // console.log(routeParams, "routeParams")
     this.type = routeParams.type
     this.id = routeParams.pid
     // this.id = routeParams.data.id
@@ -515,9 +515,9 @@ export default {
     getFacilityList() {
       getFacilitiyById(this.kind)
         .then(res => {
-          console.log(res, "设施字典表")
+          // console.log(res, "设施字典表")
           this.facilityList = res.data
-          console.log(this.facilityList, "this.facilityList.....")
+          // console.log(this.facilityList, "this.facilityList.....")
 
           // console.log(this.facilityList, "this.facilityList.....")
         })
@@ -534,7 +534,7 @@ export default {
             if (res.code == 200) {
               // console.log(res, "检查项数据")
               this.checkItems = res.data
-              console.log(this.checkItems, "this.checkItems")
+              // console.log(this.checkItems, "this.checkItems")
               for (let i = 0; i < this.checkItems.length; i++) {
                 this.checkItems[i].isCheck = ""
                 this.checkItems[i].checkEnumId = ""
@@ -552,7 +552,7 @@ export default {
         this.disabled = true
         checkFacilitiyInfo(this.id)
           .then(res => {
-            console.log(res, "查看数据222")
+            // console.log(res, "查看数据222")
             this.checkItems = res
             /* this.checkItems.forEach(element => {
               element.createDate = element.createDate.substring(0,element.createDate.length-3)
@@ -679,16 +679,16 @@ export default {
             this.checkItems[i].isCheck === 0
           ) {
             num += 1
-            console.log(this.checkItems[i], num, "该项被选中了")
+            // console.log(this.checkItems[i], num, "该项被选中了")
           }
 
           if (num == this.checkItems.length) {
             this.data1.equipFacilities.checkState = 1
             this.flag = true
-            console.log("此时暂存变保存，切状态改为已完成")
+            // console.log("此时暂存变保存，切状态改为已完成")
           } else {
             this.data1.equipFacilities.checkState = 0
-            console.log("此时暂存还是暂存，切状态改为 进行中")
+            // console.log("此时暂存还是暂存，切状态改为 进行中")
           }
         }
       }

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/index.vue

@@ -157,7 +157,7 @@ export default {
       getFacility(40)
         .then(res => {
           if (res.code == 200) {
-            console.log(res, "设施种类")
+            // console.log(res, "设施种类")
             // console.log(res.data[2].children,'设备设施种类')
             // 设施种类保存本地，并且tavle中，遍历的时候与其对应一下，显示种类名称
             this.facilityKind = res.data
@@ -195,20 +195,18 @@ export default {
     },
 
     handleAdd(type, index, row) {
-      console.log(index, "index", row, "row")
-      console.log(row.checkTime, "改变时间...")
+
       row.checkTime = getDateTimeNow()
       this.datetime = getDateTimeNow()
 
-      console.log(row.checkTime, "改变时间111...")
-      console.log( this.datetime, "改变时间...")
+
       if (row.depotId == null) {
         row.depotId = this.depotId
-        console.log("库id为空时")
+        // console.log("库id为空时")
       }
       if (row.houseId == null) {
         row.houseId = this.houseId
-        console.log("仓房id为空时")
+        // console.log("仓房id为空时")
       }
 
       this.$router.push({

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

@@ -232,7 +232,6 @@ export default {
 
     //修改
     handleEdit(type, index, row) {
-      console.log(row, "修改row...")
       this.$router.push({
         path: "/reservesManagement/fumigationManagement/steps",
         query: {

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

@@ -34,7 +34,7 @@
           <div class="tf_title">
             <i class="iconfont iconshu"></i>
             <span v-if="stepActive == 0 || step == 1">流程（熏蒸计划审批）</span>
-            <span v-if="stepActive == 3 || step == 4">流程（熏蒸散气申请审批）</span> 
+            <span v-if="stepActive == 3 || step == 4">流程（熏蒸散气申请审批）</span>
           </div>
           <el-steps direction="vertical" :active="processActive">
             <el-step  v-for="(item, index) in tableDataAudit"  :key="index"  icon="el-icon-edit">
@@ -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 {
@@ -571,9 +571,9 @@ export default {
             this.stepActive = this.stepActive + 1
             this.processId = this.$route.query.processId
             this.step = this.stepActive + 1
-            this.totalData = [] 
-            this.tableData = []   
-            this.process = [] 
+            this.totalData = []
+            this.tableData = []
+            this.process = []
             this.subList = []
             this.getCheckList()
           }else{
@@ -622,14 +622,14 @@ export default {
       this.button = "暂存"
     }
   },
-} 
+}
 </script>
 <style lang="scss" scoped>
 .mainContainer {
   background: #fff;
   padding: 10px;
    height: calc(100% - 40px);
- 
+
   .div_parent{
   height:100%;
   overflow-y:auto ;
@@ -683,9 +683,9 @@ export default {
     color: #037d41;
     font-size: 18px;
   }
-  .el-steps {
+ /*  .el-steps {
   // height: 330px !important;
-}
+} */
 
 .icon_wai{
   width:3em;

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

@@ -103,7 +103,7 @@
           prop="anomalousStatus"
           label="有无异常"
           align="center"
-          
+
         >
           <template slot-scope="scope">
 
@@ -282,7 +282,7 @@ export default {
   mounted() {
     this.activeName = this.$route.name
     let routeParams = this.$route.query
-    console.log(routeParams,'routerouteParams')
+    // console.log(routeParams,'routerouteParams')
     // console.log(routeParams.type, "type")
     // console.log(this.data2, "this.data2")
     this.type = routeParams.type

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

@@ -879,8 +879,8 @@ export default {
           console.log(this.data5.grainConditionRecord.anomalousStatus,'异常解除')
         } */
         })
-        console.log(JSON.parse(JSON.stringify(this.data5)), "this.data5----")
-        console.log(this.data5, "xiugai hou 的data5")
+        // 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

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

@@ -359,18 +359,6 @@ export default {
     //获取最新粮情
     getList() {
       // let userinfo =JSON.parse(localStorage.getItem("userInfo"))
-      // console.log(JSON.parse(userinfo),'userInfo')
-      // console.log(userinfo.depotId,'userinfo.depotId')
-      // console.log('121111........')
-      // 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 = {
         depotId:
           this.depotId !== null || this.depotId !== undefined
@@ -419,7 +407,6 @@ export default {
           }
         }
       }
-      // console.log(this.sortData, "this.sortData.....")
     },
     // 状态改成图标
     formatterColumn(row, column) {
@@ -435,8 +422,6 @@ export default {
     // 除保管员外弹窗
     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
@@ -451,10 +436,6 @@ export default {
       this.$msgbox({
         // title: "新增" + val.checkPerson,
         title: "新增" + item.enumName,
-        /* message: h('p', null, [
-            h('span', null, '内容可以是 '),
-            h('i', { style: 'color: teal' }, 'VNode')
-          ]), */
         center: true,
         showCancelButton: true,
         confirmButtonClass: "el-button--success is-plain",