入库质量

shanXiPlatform/src/components/Breadcrumb/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2020-12-17 13:59:37
- * @LastEditTime: 2021-03-16 16:03:07
+ * @LastEditTime: 2021-04-15 16:45:23
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \csc-szls-vue\shanXiPlatform\src\components\Breadcrumb\index.vue
@@ -13,9 +13,9 @@
 
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <!-- <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> -->
-        <span v-else>{{ item.meta.title }}</span>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length" class="no-redirect">{{ item.meta.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <!-- <span v-else>{{ item.meta.title }}</span> -->
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -50,9 +50,9 @@ export default {
       console.log(matched,"matched")
       const first = matched[0]
 
-      // if (!this.isDashboard(first)) {
-      //   matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
-      // }
+     /*  if (!this.isDashboard(first)) {
+        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+      } */
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
 
@@ -68,14 +68,20 @@ export default {
       // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
       const { params } = this.$route
       var toPath = pathToRegexp.compile(path)
+      console.log(toPath,'toPath')
       return toPath(params)
     },
     handleLink(item) {
       const { redirect, path } = item
+      console.log(item,'item')
       if (redirect) {
-        this.$router.push(redirect)
+       /*  var tab =redirect.split("/");
+        console.log(tab[1],'tab')
+        console.log(redirect,'redirect') */
+        this.$router.push(redirect.split("/")[1])
         return
       }
+      console.log(path,'path')
       this.$router.push(this.pathCompile(path))
     }
   }
@@ -86,7 +92,7 @@ export default {
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
   font-size: 14px;
-  line-height: 50px;
+  line-height: 54px;
   margin-left: 8px;
   color:#555555;
   .no-redirect {

shanXiPlatform/src/router/index.js

@@ -378,7 +378,7 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: '粮情检查', icon: 'dashboard',isshowLibrary:true, affix: true },
       },
-      
+
       {
         path: 'gzjftable',
         component: () => import('@/views/home/gzjftable'),
@@ -672,8 +672,52 @@ export const constantRoutes = [
         meta: { title: '仓房信息', icon: 'cangfang', affix: false, relation: 'house', istable: true },
         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 }
+        
+      },
+      {
+        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 */ }
+      },
+     /*  {
+        // 数量质量/入库质量
+
+        path: 'warehousingQuality',
+        // component: () => import('@/views/countQuality/warehousingQuality/StorageQuality'),
+        name: 'warehousingQuality',
+        redirect: 'warehousingQuality/StorageQuality',
+        meta: { title: '入库质量', icon: 'cangfang', affix: false, relation: 'house', istable: true },
+        resourceCode:174,
+        children:[
+            // 入库质量/新增
+            {
+              path: 'StorageQuality',
+              component: () => import('@/views/countQuality/warehousingQuality/StorageQuality'),
+              name: 'StorageQuality',
+              hidden: true,
+              meta: { title: '入库质量记录', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
+            },
+            {
+              path: 'steps',
+              component: () => import('@/views/countQuality/warehousingQuality/steps'),
+              name: 'steps',
+              hidden: true,
+              meta: { title: '新增', icon: 'dashboard', affix: false, noCache: true, relation: 'house', istable: false }
+            },
+        ]
+      }, */
+
+      {
         path: 'inventory',
         component: storeTabs,
         name: 'inventory',

shanXiPlatform/src/views/countQuality/delivery/deliveryQuality.vue

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

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

@@ -0,0 +1,408 @@
+<!--
+ * @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-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="info"
+                plain
+                @click="clear()"
+                class="iconfont iconclear"
+              >
+                清空</el-button
+              >
+
+              <el-button
+                type="success"
+                icon="el-icon-search"
+                plain
+                @click="search()"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-form>
+          <div>
+            <el-button
+              v-if="$tools.IsPermission(203)"
+              type="success"
+              icon="el-icon-circle-plus"
+              plain
+              @click="add()"
+              >新增</el-button
+            >
+          </div>
+        </div>
+
+        <el-table
+          border
+          stripe
+          :data="StorageData"
+          highlight-current-row
+          style="width: 100%"
+          :header-cell-style="{ background: '#f8f8f8' }"
+        >
+          <el-table-column
+            :index="indexMethod"
+            type="index"
+            align="center"
+            label="记录时间"
+            width="150px"
+          >
+          </el-table-column>
+
+          <el-table-column prop="type" label="检测结果">
+            <template>
+              <div class="steps">
+                <!-- :active="stepActive" direction="horizontal"-->
+                <el-steps
+                  align-center
+                  :active="stepActive"
+                  finish-status="success"
+                  direction="horizontal"
+                >
+                  <!--  v-for="(item, index) in totalData"
+            :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'
+              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"
+                    />
+                  </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"
+                    />
+                  </el-step>
+                </el-steps>
+              </div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="applyTime" label="时间" align="center">
+          </el-table-column> -->
+          <el-table-column
+            prop="auditState"
+            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>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="operation"
+            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)"
+                >查看</el-button
+              >
+
+              <el-button
+                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)
+                "
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                @click="handleDelete(scope.$index, scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <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"
+          :total="pagination.total"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      //初始化点击的步骤
+      step: 0,
+      //初始化步骤高亮显示到第几步
+      stepActive: 0,
+      //步骤1
+      //存储用户信息
+      userInfo: {},
+      //仓房编号
+      houseId: this.$store.state.houseId,
+      //库编号
+      depotId: this.$store.state.depotId,
+      //类型
+      type: "yjly",
+      value: "",
+      query: {
+        // startTime: "",
+        // endTime: "",
+        value1: ""
+      },
+      //分页
+
+      pagination: {
+        //当前页数
+        curPage: 1,
+        //每页显示的条数
+        pageSize: 10,
+        //总条数
+        total: 0
+      },
+      // 列表数据
+      StorageData: [
+        {
+          time: "2021-034-13",
+          check: ""
+        }
+      ]
+    }
+  },
+  methods:{
+    // 新增流程
+    add()  {
+      this.$router.push({
+        path: "steps",
+       /*  query: {
+          type: type,
+        }, */
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.contentContainer {
+  background: #fff;
+  .top {
+    padding-left: 10px;
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+    font-weight: 400;
+    font-size: 16px;
+  }
+  .container {
+    padding: 10px;
+    .header {
+      height: 40px;
+      line-height: 40px;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20px;
+    }
+    .el-pagination {
+      text-align: right;
+      margin-top: 20px;
+    }
+  }
+  .checkBtn.is-plain {
+    color: #037d41;
+    background-color: #fff;
+    border-color: #037d41;
+  }
+  .checkBtn.is-plain:hover {
+    color: #fff !important;
+    background-color: #13ce66 !important;
+    border: 1px solid #13ce66 !important;
+  }
+}
+.steps {
+  min-height: 80px;
+  margin: 10px 0;
+  // line-height:80px;
+  .iconfont {
+    font-size: 55px;
+  }
+}
+/* /deep/ */
+.el-steps {
+  .el-step__icon {
+    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;
+  }
+}
+
+/* .el-steps {
+  height: 160px;
+} */
+
+.icon_wai {
+  width: 3em;
+  height: 3em;
+}
+</style>
+<style>
+.el-step__icon {
+  width: 45px;
+  height: 45px;
+}
+
+.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;
+}
+
+.el-step.is-horizontal .el-step__line {
+  top: 19px !important;
+}
+</style>

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

@@ -0,0 +1,376 @@
+<template>
+  <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"
+            :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'
+              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" />
+          </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" />
+          </el-step>
+        </el-steps>
+      </div>
+      <div>
+        <el-table
+          :header-row-class-name="goodsInfo"
+          :cell-class-name="goodsInfo"
+          border
+          :data="personData"
+          highlight-current-row
+          @current-change="handleCurrentChange"
+          style="width: 100%"
+          :header-cell-style="{ background: '#f8f8f8' }"
+        >
+          <el-table-column
+            property="qtypeName"
+            label="检查类型"
+            align="center"
+            width='200'
+          ></el-table-column>
+         <el-table-column
+            property="checkTime"
+            style="padding:0;"
+            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="检查项"
+            align="center"
+
+          >
+            <template>
+              <p
+                style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
+              >
+                质量
+              </p>
+              <p
+                style="height:45px;line-height:45px;margin:0; padding-top:7px;border-top:1px solid #dfe6ec;border-bottom:1px solid #dfe6ec;"
+              >
+                品质
+              </p>
+              <p style="height:45px;line-height:45px;margin:0;padding-top:7px;">
+                毒素指标
+              </p>
+            </template>
+          </el-table-column>
+          <el-table-column
+
+            property="operation"
+            label="选项"
+            align="center"
+            min-width='250'
+          >
+             <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> -->
+              <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>
+              </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>
+              </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>
+              </p>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getkccknew } from "@/api/countQuality/index"
+export default {
+  data() {
+    return {
+       query: {
+        roleId: ""
+      },
+      personData: [
+        {
+          createTime: "",
+          d: "质量",
+          c: ""
+        },
+        {
+          createTime: "",
+          d: "品质",
+          c: ""
+        },
+        {
+          createTime: "",
+          d: "毒素指标",
+          c: ""
+        }
+      ],
+      depotId: "",
+      depotName: "",
+      loading: false,
+      model: {
+        ccharacter: "",
+        cquality: "",
+        ctoxinIndex: "",
+        depotId: "",
+        depotYpte: 1,
+        qid: "",
+        qtype: "",
+        warehouseId: "",
+        saveState: ""
+      }
+    }
+      /* personData: [],
+      total: 0,
+      id: "",
+      depotId: "",
+      warehouseId: "",
+      depotYpte: 1 */
+
+  },
+  created() {
+    // this.depotId = JSON.parse(getUser()).depotId
+    // this.warehouseId = this.$store.state.houseId
+    this.getList()
+  },
+  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
+      }
+    },
+    goodsInfo(row) {
+      if (row.columnIndex == 3 || row.columnIndex == 2) {
+        return "goodsInfo"
+      }
+    },
+
+    getList() {
+      getkccknew(this.depotId, "1").then(res => {
+        this.personData = res.data
+        this.total = res.data.total
+      })
+    },
+    addbtn(index, row) {
+      this.$router.push({
+        name: "delivdetail",
+        query: {
+          state: "add",
+          qid: row.qid,
+          qtype: row.qtype,
+          qtypeName: row.qtypeName
+        }
+      })
+    },
+    morebtn(index, row) {
+      this.$router.push({
+        name: "alldeliveryQuality",
+        query: {
+          qtype: row.qtype,
+          state: "more"
+        }
+      })
+    },
+    handleCurrentChange() {}
+  }
+}
+</script>
+<style>
+.goodsInfo {
+  padding: 0 !important;
+}
+.goodsInfo .cell {
+  padding: 0;
+  overflow: unset;
+}
+.el-step__icon {
+  width: 45px;
+  height: 45px;
+}
+</style>
+<style lang="scss" scoped>
+.container {
+  height: 100%;
+  display: flex;
+  #mainLeft {
+    width: 300px;
+    height: calc(100vh - 200px);
+    border: 1px solid #e6e6e6;
+  }
+  #mainRight {
+    margin-left: 20px;
+    width: calc(99%);
+    .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;
+    }
+    .colorspanr {
+      width: 140px;
+      height: 30px;
+      background-color: #ff9933;
+      display: inline-block;
+      border-radius: 5px;
+    }
+  }
+}
+.steps {
+  min-height: 80px;
+  margin: 10px 0;
+  // line-height:80px;
+  .iconfont {
+    font-size: 55px;
+  }
+}
+/* /deep/ */
+.el-steps {
+  .el-step__icon {
+    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 {
+  width: 3em;
+  height: 3em;
+}
+.button {
+  text-align: right;
+  margin-right: 20px;
+  padding-bottom: 20px;
+}
+.pagination-container {
+  margin: 15px 0;
+  margin-right: 20px;
+  text-align: right;
+}
+</style>

shanXiPlatform/src/views/login/index.vue

@@ -208,7 +208,7 @@ export default {
       // disabled:true,
 
       key: "", //验证码绑定key
-      flag: false,
+      flag: null,
       passwordType: "password",
       capsTooltip: false,
       loading: false,
@@ -285,9 +285,10 @@ export default {
         .then(res => {
           if (res.code == 200) {
             this.flag = true
+            // console.log(this.flag,'flag')
           } else {
             this.flag = false
-
+            // console.log(this.flag,'flag')
             this.getCaptcha()
           }
         })
@@ -304,6 +305,7 @@ export default {
             uPassword: this.loginForm.password
           }
           if (this.flag) {
+            // console.log(this.flag,'flag')
             login(loginInfo)
               .then(res => {
                 if (res.code == 200) {
@@ -416,6 +418,7 @@ export default {
               })
           } else {
             this.loading = false
+            // console.log(this.flag,'flag')
             this.$message({
               message: "验证码错误，请重新输入",
               type: "err"

shanXiPlatform/src/views/medicamentManagement/medicamentApplication/index.vue

@@ -18,7 +18,7 @@
             <el-form-item>
               <div style="display:inline-block;width:8px;border-top:1px solid #ccc"></div>
             </el-form-item>
-          
+
             <el-form-item label="">
               <el-date-picker
                 v-model="query.endTime"
@@ -50,7 +50,7 @@
               >
                 清空</el-button
               >
-          
+
               <el-button
                 type="success"
                 icon="el-icon-search"
@@ -75,7 +75,7 @@
         <el-table
           border
           stripe
-         
+
           :data="yjlyData"
           highlight-current-row
           style="width: 100%"
@@ -87,7 +87,7 @@
             align="center"
             label="序号"
             width="50px"
-           
+
           >
           </el-table-column>
 
@@ -115,14 +115,14 @@
               <el-button
               v-if="$tools.IsPermission(205)"
                 size="mini"
-                type="detailbtn" 
+                type="detailbtn"
                 @click="handleCheck(3, scope.$index, scope.row)"
                 >查看</el-button
               >
 
               <el-button
                 size="mini"
-                type="editbtn" 
+                type="editbtn"
                 @click="handleEdit(2, scope.$index, scope.row)"
                 v-if="
                   scope.row.auditState != 0 &&
@@ -312,7 +312,7 @@ export default {
                item.type="药剂领用"
              }
            })
-          
+
             this.pagination.pageSize = res.data.size
             this.pagination.total = res.data.total
           }
@@ -355,7 +355,7 @@ export default {
   computed: {
     HouseId() {
       return this.$store.state.houseId;
-    
+
     },
     // DepotId() {
     //   return this.$store.state.depotId
@@ -369,7 +369,7 @@ export default {
       this.houseId = val;
         var houseData=JSON.parse(localStorage.getItem("houseData"));
      console.log(houseData,"houseData...")
-   
+
 
     this.depotId=houseData.parentCode;
     console.log(this.depotId,"库id")
@@ -378,9 +378,9 @@ export default {
     },
   mounted() {
     console.log(this.$store.state.houseId,">>>>>>>???????")
-   
-   
-   
+
+
+
       this.userInfo = JSON.parse(getUser())
     console.log(this.userInfo, "this.userInfo.....?????")
     this.yjlyList()

shanXiPlatform/src/views/medicamentManagement/medicamentApplication/step1.vue

@@ -1,5 +1,5 @@
 <template>
- 
+
       <div>
         <div id="step1">
           <el-table
@@ -16,7 +16,7 @@
               width="100px"
             >
               <template slot-scope="scope">
-             
+
                 <div
                   v-if="
                     scope.row.hasOwnProperty('process') &&
@@ -124,7 +124,7 @@
           </div>
         </div>
       </div>
- 
+
 </template>
 <script>
 //时间格式的转化
@@ -158,19 +158,19 @@ export default {
       required: true,
     },
      mainId: {
-     
+
       required: true,
     },
      fromPeople: {
-    
+
       required: true,
     },
      applyPeople: {
-  
+
       required: true,
     },
 
-   
+
   },
   data() {
     return {
@@ -192,7 +192,7 @@ export default {
     radioChange(row) {
       console.log(getNowFormatDate())
       row.operationTime = getNowFormatDate()
-     
+
     },
 
   //流程新增
@@ -274,17 +274,17 @@ export default {
         this.yjlyAdd()
       }
     },
-   
-     
+
+
 //返回
 goBack(){
   this.$router.push({
     path:"/medicamentManagement/medicamentApplication"
   })
 },
-  
 
-   
+
+
     // 用户字典列表
     getUserList() {
       // var params = {
@@ -329,10 +329,10 @@ goBack(){
       }
     }
 
-  
- 
 
-   
+
+
+
     .btns {
       text-align: right;
       margin: 20px 10px 0 0;
@@ -367,8 +367,9 @@ goBack(){
   }
 
 </style>
-<style>
+<style >
   .el-step.is-horizontal .el-step__line{
-  top:21px !important;
+      top:21px !important;
+
 }
-</style>
+</style>

shanXiPlatform/src/views/medicamentManagement/medicamentApplication/steps.vue

@@ -30,7 +30,7 @@
               v-if="stepActive > index"
             />
 
-         
+
           </el-step>
         </el-steps>
       </div>
@@ -355,7 +355,7 @@ export default {
         this.mainId = this.totalData[0].step.id
       } else if (this.stepActive == 1) {
         this.tableData = this.totalData[1].list
-      } 
+      }
       // this.tableData = this.totalData[this.stepActive].list
     },
     //radio选项改变是
@@ -413,7 +413,7 @@ export default {
         this.button = "保存并提交"
         //2修改  3查看
 
-      
+
         if (this.pageType == 1) {
           this.disabled = false
           this.isShow = true
@@ -540,12 +540,12 @@ export default {
         console.log(this.process, "process....s")
         if (this.totalData[0].list[0].subData == null) {
           this.$message("请先选择选项");
-          
-         
+
+
           return;
-           
+
         }
-         
+
         //判断是否选择了审批人
         var flag = true
         // this.process.forEach((item) => {
@@ -565,10 +565,10 @@ export default {
         }
 
         if (flag) {
-       
+
           this.yjlyAdd()
-         
-        
+
+
         }
       } else {
         //this.getUpdateList()
@@ -577,15 +577,15 @@ export default {
           this.ongoingStep = this.stepActive
           this.getUpdateList()
         } else if (this.button == "完成") {
-          
+
           if (this.stepActive + 1 == this.step) {
             this.stepActive = this.stepActive + 1
           }
-         
+
             this.auditState = 4
-       
 
-         
+
+
 
           this.getUpdateList()
         }
@@ -650,7 +650,7 @@ export default {
 
   mounted() {
     //获取当前缓存的用户信息
-   
+
     this.userInfo = JSON.parse(getUser())
     console.log(this.userInfo, "this.userInfo.....?????")
 
@@ -706,7 +706,7 @@ export default {
   background: #fff;
   padding: 10px;
    height: calc(100% - 40px);
- 
+
   .div_parent{
   height:100%;
   overflow-y:auto ;

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

@@ -18,7 +18,7 @@
             <el-form-item>
               <div style="display:inline-block;width:8px;border-top:1px solid #ccc"></div>
             </el-form-item>
-          
+
             <el-form-item label="">
               <el-date-picker
                 v-model="query.endTime"
@@ -290,7 +290,7 @@ export default {
         type: this.type,
         startTime: this.query.value1[0],
         endTime: this.query.value1[1],
-       
+
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -326,7 +326,7 @@ export default {
 
     //查询
     search() {
-      
+
       this.tfList()
     },
     //当前页发生变化时