style:证书入库

renchao@pashanhoo.com
Showing 7 changed files with 120 additions and 53 deletions
src/layout/components/Sidebar/SidebarItem.vue
src/layout/components/Sidebar/index.vue
src/views/sqcx/dydjb/components/addDydjb.vue
src/views/sqcx/dydjb/components/dydjbInfo.vue
src/views/sqcx/jtfc/components/addjtfc.vue
src/views/zsgl/zsrk/components/addDialog.vue
src/views/zsgl/zsrk/zsrk.vue
--- a/src/layout/components/Sidebar/SidebarItem.vue
View file @dcb5889
+++ b/src/layout/components/Sidebar/SidebarItem.vue
View file @dcb5889
@@ -14,7 +14,7 @@
      <template slot="title">
        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
      </template>
-      <sidebar-item v-for="child in item.children" :key="child.path" :is-nest="true" :item="child"
+      <sidebar-item v-for="(child, index) in item.children" :key="index" :is-nest="true" :item="child"
        :base-path="resolvePath(child.path)" class="nest-menu" />
    </el-submenu>
  </div>
--- a/src/layout/components/Sidebar/index.vue
View file @dcb5889
+++ b/src/layout/components/Sidebar/index.vue
View file @dcb5889
@@ -2,10 +2,9 @@
  <div>
    <el-scrollbar wrap-class="scrollbar-wrapper">
      <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
-        :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false"
+        :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
-        mode="vertical">
        <!-- 权限菜单 -->
-        <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
+        <sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route" :base-path="route.path" />
        <!-- 菜单全部展示 -->
        <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->
      </el-menu>
--- a/src/views/sqcx/dydjb/components/addDydjb.vue
View file @dcb5889
+++ b/src/views/sqcx/dydjb/components/addDydjb.vue
View file @dcb5889
@@ -226,7 +226,7 @@ export default {
  @include flex;
  flex-direction: column;
  overflow-y: hidden;
-  max-height: 87vh;
+  max-height: 85vh;
  padding: 0 2px;
  .jtfccx-edit-con {
--- a/src/views/sqcx/dydjb/components/dydjbInfo.vue
View file @dcb5889
+++ b/src/views/sqcx/dydjb/components/dydjbInfo.vue
View file @dcb5889
@@ -84,10 +84,9 @@ export default {
        if (res.code == 200) {
            this.resultData = res.result
        }
-      });
+      })
    }
-  },
+  }
 };
 </script>
 <style scoped lang="scss">
--- a/src/views/sqcx/jtfc/components/addjtfc.vue
View file @dcb5889
+++ b/src/views/sqcx/jtfc/components/addjtfc.vue
View file @dcb5889
@@ -58,11 +58,7 @@ import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
 import { getPrintTemplateByCode } from "@/api/system";
 import { datas, sendThis } from "./addjtfcdata";
 import { getLodop } from "@/utils/LodopFuncs"
-import { mapGetters } from "vuex";
 export default {
-  computed: {
-    ...mapGetters(["dictData"]),
-  },
  props: {
    formData: {
      type: Object,
@@ -236,7 +232,7 @@ export default {
  @include flex;
  flex-direction: column;
  overflow-y: hidden;
-  max-height: 87vh;
+  max-height: 85vh;
  padding: 0 2px;
--- a/src/views/zsgl/zsrk/components/addDialog.vue
View file @dcb5889
+++ b/src/views/zsgl/zsrk/components/addDialog.vue
View file @dcb5889
 <template>
-  <dialogBox title="证书入库" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%"
+  <!-- <dialogBox title="证书入库" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%"
    @closeDialog="closeDialog" v-model="myValue" :isButton="readOnly">
    <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
      <el-row>
@@ -60,22 +60,90 @@
        <el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
      </el-form-item>
    </el-form>
-  </dialogBox>
+  </dialogBox> -->
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="入库编号:" prop="batchno">
+            <el-input v-model="ruleForm.batchno" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="登记机构:" prop="djjg">
+            <el-select v-model="ruleForm.djjg" class="width100" placeholder="请选择" :disabled="!readOnly">
+              <el-option v-for="item in  DJJGLIST" :key="item.dname" :label="item.dname" :value="item.dname">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="入库人员:">
+            <el-input v-model="ruleForm.operator" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库时间:" prop="operationtime">
+            <el-date-picker v-model="ruleForm.operationtime" class="width100" type="datetime" :disabled="!readOnly"
+              value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div>
+        <el-table :data="tableForm" border style="width: 100%"
+          :header-cell-style="{ 'text-align': 'center', background: 'rgb(236, 245, 255)' }"
+          :cell-style="{ 'text-align': 'center' }">
+          <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
+          <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="bs" label="本数">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
+              <span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
+              <span v-else>{{ scope.row.bs }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-form-item label="备注" class="middle-margin-bottom">
+        <el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
+      </el-form-item>
+      <el-row v-if="readOnly">
+        <el-form-item>
+          <el-button type="primary" @click="submitForm">保存</el-button>
+          <el-button @click="closeDialog">取消</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+  </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+import store from '@/store/index.js'
-import { getSysSerialSingle, zsrk,getZsglInfo} from "@/api/zsgl.js"
+import { getSysSerialSingle, zsrk, getZsglInfo } from "@/api/zsgl.js"
 export default {
-  computed: {
-    ...mapGetters(['dictData']),
-  },
  props: {
-    value: { type: Boolean, default: false },
+    formData: {
+      type: Object,
+      default: () => { },
+    },
  },
  data () {
    return {
-      myValue: this.value,
+      DJJGLIST: store.getters.dictData['ywly'],
      readOnly: false,
      //表单提交数据
      ruleForm: {
@@ -128,9 +196,11 @@ export default {
      },
    }
  },
-  watch: {
+  mounted () {
-    value (val) {
+    if (this.formData.bsmBatch) {
-      this.myValue = val
+      this.getDetailInfo(this.formData.bsmBatch);
+    } else {
+      this.ywhSerial();
    }
  },
  methods: {
@@ -163,19 +233,19 @@ export default {
      })
    },
    //获取详情信息
-    getDetailInfo(bsmBatch) {
+    getDetailInfo (bsmBatch) {
-       getZsglInfo({"bsmBatch": bsmBatch}).then(res => {
+      getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
-          if(res.code == 200){
+        if (res.code == 200) {
-            this.ruleForm = res.result;
+          this.ruleForm = res.result;
-            this.readOnly = false;
+          this.readOnly = false;
-            this.tableForm[0].ksysxlh = res.result.zsstarno;
+          this.tableForm[0].ksysxlh = res.result.zsstarno;
-            this.tableForm[0].jsysxlh = res.result.zsendno;
+          this.tableForm[0].jsysxlh = res.result.zsendno;
-            this.tableForm[0].bs = res.result.zsnum;
+          this.tableForm[0].bs = res.result.zsnum;
-            this.tableForm[1].ksysxlh = res.result.zmstarno;
+          this.tableForm[1].ksysxlh = res.result.zmstarno;
-            this.tableForm[1].jsysxlh = res.result.zmendno;
+          this.tableForm[1].jsysxlh = res.result.zmendno;
-            this.tableForm[1].bs = res.result.zmnum;
+          this.tableForm[1].bs = res.result.zmnum;
-          }
+        }
-       })
+      })
    },
    //印刷序列号处理
    ysxlhDeal (item) {
@@ -244,6 +314,7 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/dialogBoxheader.scss";
 .font-red {
  color: red
 }
--- a/src/views/zsgl/zsrk/zsrk.vue
View file @dcb5889
+++ b/src/views/zsgl/zsrk/zsrk.vue
View file @dcb5889
@@ -18,8 +18,8 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="结束时间">
-              <el-date-picker v-model="ruleForm.rkjssj" :picker-options="pickerOptionsEnd" type="date"
+              <el-date-picker v-model="ruleForm.rkjssj" :picker-options="pickerOptionsEnd" type="date" placeholder="结束日期"
-                placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
+                value-format="yyyy-MM-dd" clearable>
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -39,19 +39,19 @@
        :data="tableData.data">
      </lb-table>
    </div>
-    <addDialog ref="addDialog" v-model="isDialog" />
+    <!-- 查看弹框 -->
+    <!-- <addDialog ref="addDialog" v-model="isDialog" /> -->
    <viewDialog v-model="viewDialog" />
  </div>
 </template>
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./zsrkdata";
-import addDialog from "./components/addDialog.vue";
 import viewDialog from "../components/viewDialog.vue";
 import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
 export default {
  name: "zsrk",
-  components: { addDialog, viewDialog },
+  components: { viewDialog },
  mixins: [table],
  mounted () {
    sendThis(this);
@@ -94,16 +94,18 @@ export default {
  },
  methods: {
    openDialog (bsmBatch) {
-      if (bsmBatch) {
+      // if (bsmBatch) {
-        this.$nextTick(() => {
+      //   this.$nextTick(() => {
-          this.$refs.addDialog.getDetailInfo(bsmBatch);
+      //     this.$refs.addDialog.getDetailInfo(bsmBatch);
-        })
+      //   })
-      } else {
+      // } else {
-        this.$nextTick(() => {
+      //   this.$nextTick(() => {
-          this.$refs.addDialog.ywhSerial();
+      //     this.$refs.addDialog.ywhSerial();
-        })
+      //   })
-      }
+      // }
-      this.isDialog = true;
+      this.$popupDialog("证书入库", "zsgl/zsrk/components/addDialog", {
+        bsmBatch: bsmBatch
+      })
    },
    queryClick () {
      getZsglrkList({ ...this.ruleForm, ...this.pageData }).then(res => {